From ef00eaa765904231975814ef05d2d490caaf7574 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 5 Apr 2018 14:53:22 +0200 Subject: [PATCH] Adds missing content to budget investments mode view This feature was already on Madrid fork and missing on backport --- .../budgets/investments_controller.rb | 1 + app/helpers/budget_investments_helper.rb | 19 +++++++++++++++++++ .../investments/_investment_minimal.html.erb | 13 +++++++++++++ app/views/budgets/investments/index.html.erb | 8 -------- 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 app/views/budgets/investments/_investment_minimal.html.erb diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb index 119040e74..1e1df4f1f 100644 --- a/app/controllers/budgets/investments_controller.rb +++ b/app/controllers/budgets/investments_controller.rb @@ -16,6 +16,7 @@ module Budgets before_action :set_random_seed, only: :index before_action :load_categories, only: [:index, :new, :create] before_action :set_default_budget_filter, only: :index + before_action :set_view, only: :index skip_authorization_check only: :json_data diff --git a/app/helpers/budget_investments_helper.rb b/app/helpers/budget_investments_helper.rb index 01e293c3a..e3f17601a 100644 --- a/app/helpers/budget_investments_helper.rb +++ b/app/helpers/budget_investments_helper.rb @@ -8,4 +8,23 @@ module BudgetInvestmentsHelper def budget_investments_advanced_filters(params) params.map { |af| t("admin.budget_investments.index.filters.#{af}") }.join(', ') end + + def investments_minimal_view_path + budget_investments_path(id: @heading.group.to_param, + heading_id: @heading.to_param, + filter: @current_filter, + view: investments_secondary_view) + end + + def investments_default_view? + @view == "default" + end + + def investments_current_view + @view + end + + def investments_secondary_view + investments_current_view == "default" ? "minimal" : "default" + end end diff --git a/app/views/budgets/investments/_investment_minimal.html.erb b/app/views/budgets/investments/_investment_minimal.html.erb new file mode 100644 index 000000000..acc999252 --- /dev/null +++ b/app/views/budgets/investments/_investment_minimal.html.erb @@ -0,0 +1,13 @@ +
+
+
+
+
+ <% cache [locale_and_user_status(investment), 'index_minimal', investment, investment.author] do %> +

<%= link_to investment.title, namespaced_budget_investment_path(investment) %>

+ <% end %> +
+
+
+
+
diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index a0b4c2ba9..e23efac73 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -70,20 +70,12 @@ ballot: @ballot } %> <% end %> - - <%= render "banners" if @budget.selecting? || @budget.balloting? %> - <%= paginate @investments %> - <% else %> <% @investments.each do |investment| %> <%= render partial: '/budgets/investments/investment_minimal', locals: { investment: investment } %> <% end %> - - <%= render "banners" if @budget.selecting? || @budget.balloting? %> - <%= paginate @investments %> - <% end %> <%= paginate @investments %>