diff --git a/app/controllers/admin/spending_proposals_controller.rb b/app/controllers/admin/spending_proposals_controller.rb index 2ef48f320..3ae4872db 100644 --- a/app/controllers/admin/spending_proposals_controller.rb +++ b/app/controllers/admin/spending_proposals_controller.rb @@ -21,7 +21,7 @@ class Admin::SpendingProposalsController < Admin::BaseController def update if @spending_proposal.update(spending_proposal_params) - redirect_to admin_spending_proposal_path(@spending_proposal), notice: t("flash.actions.update.spending_proposal") + redirect_to admin_spending_proposal_path(@spending_proposal, anchor: 'classification'), notice: t("flash.actions.update.spending_proposal") else render :edit end diff --git a/app/views/admin/spending_proposals/_spending_proposal_data_written_by_author.html.erb b/app/views/admin/spending_proposals/_spending_proposal_data_written_by_author.html.erb new file mode 100644 index 000000000..dec203ca9 --- /dev/null +++ b/app/views/admin/spending_proposals/_spending_proposal_data_written_by_author.html.erb @@ -0,0 +1,38 @@ +
+ <%= t("admin.spending_proposals.show.geozone") %>: + <%= geozone_name(@spending_proposal) %> +
++ <%= t("admin.spending_proposals.show.by") %>: + <%= link_to @spending_proposal.author.name, admin_user_path(@spending_proposal.author) %> +
++ <%= t("admin.spending_proposals.show.sent") %>: + <%= l @spending_proposal.created_at, format: :datetime %> +
+<%= t("admin.spending_proposals.show.association_name") %>: + <%= @spending_proposal.association_name %> +
+<% end %> + +<% if @spending_proposal.external_url.present? %> +<%= text_with_links @spending_proposal.external_url %>
+<% end %> + +<%= safe_html_with_links @spending_proposal.description %> diff --git a/app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb b/app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb new file mode 100644 index 000000000..e231d1d23 --- /dev/null +++ b/app/views/admin/spending_proposals/_spending_proposal_data_written_by_valuators.html.erb @@ -0,0 +1,23 @@ +<%= t("admin.spending_proposals.show.price") %> (<%= t("admin.spending_proposals.show.currency") %>): + <%= @spending_proposal.price.present? ? @spending_proposal.price : t("admin.spending_proposals.show.undefined") %> +
+<%= t("admin.spending_proposals.show.price_first_year") %> (<%= t("admin.spending_proposals.show.currency") %>): + <%= @spending_proposal.price_first_year.present? ? @spending_proposal.price_first_year : t("admin.spending_proposals.show.undefined") %> +
+<%= simple_format(safe_html_with_links(@spending_proposal.price_explanation.html_safe), {}, sanitize: false) if @spending_proposal.price_explanation.present? %> + +<%= t("admin.spending_proposals.show.feasibility") %>: + <%= t("admin.spending_proposals.show.#{@spending_proposal.feasibility}") %> +
+<%= simple_format(safe_html_with_links(@spending_proposal.feasible_explanation.html_safe), {}, sanitize: false) if @spending_proposal.feasible_explanation.present? %> + +<% if @spending_proposal.valuation_finished %> +<%= t("admin.spending_proposals.show.valuation_finished") %> +<% end %> + +<% if @spending_proposal.internal_comments.present? %> +
<%= t("proposals.form.tags_instructions") %>
+ <%= f.text_field :tag_list, value: @spending_proposal.tag_list.to_s, + label: false, + placeholder: t("admin.spending_proposals.edit.tags_placeholder"), + class: 'js-tag-list' %> - - -<%= f.submit(class: "button", value: t("admin.spending_proposals.edit.submit_button")) %> -
- <%= t("admin.spending_proposals.show.geozone") %>: - <%= geozone_name(@spending_proposal) %> -
-- <%= t("admin.spending_proposals.show.by") %>: - <%= link_to @spending_proposal.author.name, admin_user_path(@spending_proposal.author) %> -
-- <%= t("admin.spending_proposals.show.sent") %>: - <%= l @spending_proposal.created_at, format: :datetime %> -
-<%= t("admin.spending_proposals.show.association_name") %>: - <%= @spending_proposal.association_name %> -
-<% end %> - -<% if @spending_proposal.external_url.present? %> -<%= text_with_links @spending_proposal.external_url %>
-<% end %> - -<%= safe_html_with_links @spending_proposal.description %> - -<%= t("admin.spending_proposals.show.assigned_admin") %>: <%= @spending_proposal.administrator.try(:name_and_email) || t("admin.spending_proposals.show.undefined") %> @@ -54,44 +15,21 @@ <%= render 'shared/tags', taggable: @spending_proposal %>
-+
<%= t("admin.spending_proposals.show.assigned_valuators") %>: -
<%= t("admin.spending_proposals.show.price") %> (<%= t("admin.spending_proposals.show.currency") %>): - <%= @spending_proposal.price.present? ? @spending_proposal.price : t("admin.spending_proposals.show.undefined") %> -
-<%= t("admin.spending_proposals.show.price_first_year") %> (<%= t("admin.spending_proposals.show.currency") %>): - <%= @spending_proposal.price_first_year.present? ? @spending_proposal.price_first_year : t("admin.spending_proposals.show.undefined") %> -
-<%= simple_format(safe_html_with_links(@spending_proposal.price_explanation.html_safe), {}, sanitize: false) if @spending_proposal.price_explanation.present? %> - -<%= t("admin.spending_proposals.show.feasibility") %>: - <%= t("admin.spending_proposals.show.#{@spending_proposal.feasibility}") %> -
-<%= simple_format(safe_html_with_links(@spending_proposal.feasible_explanation.html_safe), {}, sanitize: false) if @spending_proposal.feasible_explanation.present? %> - -<% if @spending_proposal.valuation_finished %> -<%= t("admin.spending_proposals.show.valuation_finished") %> -<% end %> - -<% if @spending_proposal.internal_comments.present? %> -