diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index 37de94a2c..ae5a3e536 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -1,7 +1,12 @@ -<%= form_for(@investment, url: form_url) do |f| %> +<%= form_for(@investment, url: form_url, method: :post) do |f| %> <%= render 'shared/errors', resource: @investment %>
+
+ <%= f.label :heading_id, t("budget.investments.form.heading") %> + <%= f.select :heading_id, budget_heading_select_options(@budget), {include_blank: t("budget.headings.none"), label: false} %> +
+
<%= f.label :title, t("budget.investments.form.title") %> <%= f.text_field :title, maxlength: SpendingProposal.title_max_length, placeholder: t("budget.investments.form.title"), label: false %> @@ -19,18 +24,9 @@ <%= f.text_field :external_url, placeholder: t("budget.investments.form.external_url"), label: false %>
-
- <%= f.label :heading_id, t("budget.investments.form.heading") %> - <%= f.select :heading_id, budget_heading_select_options(@budget), {include_blank: t("budget.headings.none"), label: false} %> -
+ <% unless current_user.manager? %> -
- <%= f.label :association_name, t("budget.investments.form.association_name_label") %> - <%= f.text_field :association_name, placeholder: t("budget.investments.form.association_name"), label: false %> -
- -
- <% if @investment.new_record? %> +
<%= f.label :terms_of_service do %> <%= f.check_box :terms_of_service, title: t('form.accept_terms_title'), label: false %> @@ -39,8 +35,9 @@ conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe %> <% end %> - <% end %> -
+
+ + <% end %>
<%= f.submit(class: "button", value: t("budget.investments.form.submit_buttons.#{action_name}")) %> diff --git a/app/views/budgets/investments/new.html.erb b/app/views/budgets/investments/new.html.erb new file mode 100644 index 000000000..7695afdec --- /dev/null +++ b/app/views/budgets/investments/new.html.erb @@ -0,0 +1,8 @@ +
+ +
+

<%= t("management.budget_investments.create") %>

+ + <%= render '/budgets/investments/form', form_url: budget_investments_path(@budget) %> +
+
diff --git a/app/views/management/budgets/investments/new.html.erb b/app/views/management/budgets/investments/new.html.erb index bf8b83f90..20e27b9cc 100644 --- a/app/views/management/budgets/investments/new.html.erb +++ b/app/views/management/budgets/investments/new.html.erb @@ -7,50 +7,6 @@

<%= t("management.budget_investments.create") %>

- <%= form_for(@investment, url: management_budget_investments_path(@budget), method: :post) do |f| %> - <%= render 'shared/errors', resource: @investment %> - -
-
- <%= f.label :heading_id, t("budget.investments.form.heading") %> - <%= f.select :heading_id, budget_heading_select_options(@budget), {include_blank: t("budget.headings.none"), label: false} %> -
- -
- <%= f.label :title, t("budget.investments.form.title") %> - <%= f.text_field :title, maxlength: SpendingProposal.title_max_length, placeholder: t("budget.investments.form.title"), label: false %> -
- - <%= f.invisible_captcha :subtitle %> - -
- <%= f.label :description, t("budget.investments.form.description") %> - <%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale }, label: false %> -
- -
- <%= f.label :external_url, t("budget.investments.form.external_url") %> - <%= f.text_field :external_url, placeholder: t("budget.investments.form.external_url"), label: false %> -
- - - -
- <%= f.label :terms_of_service do %> - <%= f.check_box :terms_of_service, title: t('form.accept_terms_title'), label: false %> - - <%= t("form.accept_terms", - policy: link_to(t("form.policy"), "/privacy", target: "blank"), - conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe %> - - <% end %> -
- -
- <%= f.submit(class: "button", value: t("budget.investments.form.submit_buttons.#{action_name}")) %> -
-
- <% end %> - + <%= render '/budgets/investments/form', form_url: management_budget_investments_path(@budget) %>