From 54bd5aeeb1e645b6fe4bfc6d1a08fc858e06f0f2 Mon Sep 17 00:00:00 2001 From: kikito Date: Thu, 22 Dec 2016 20:26:21 +0100 Subject: [PATCH] adds @budget param to apply_filters_and_search --- app/controllers/budgets/investments_controller.rb | 2 +- app/controllers/management/budgets/investments_controller.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb index 6ad781da6..c17a356cb 100644 --- a/app/controllers/budgets/investments_controller.rb +++ b/app/controllers/budgets/investments_controller.rb @@ -24,7 +24,7 @@ module Budgets respond_to :html, :js def index - @investments = @investments.apply_filters_and_search(params).send("sort_by_#{@current_order}").page(params[:page]).per(10).for_render + @investments = @investments.apply_filters_and_search(@budget, params).send("sort_by_#{@current_order}").page(params[:page]).per(10).for_render @investment_ids = @investments.pluck(:id) load_investment_votes(@investments) end diff --git a/app/controllers/management/budgets/investments_controller.rb b/app/controllers/management/budgets/investments_controller.rb index d7d0789e4..7d9faff34 100644 --- a/app/controllers/management/budgets/investments_controller.rb +++ b/app/controllers/management/budgets/investments_controller.rb @@ -7,7 +7,7 @@ class Management::Budgets::InvestmentsController < Management::BaseController before_action :load_heading, only: [:index, :show, :print] def index - @investments = @investments.apply_filters_and_search(params).page(params[:page]) + @investments = @investments.apply_filters_and_search(@budget, params).page(params[:page]) load_investment_votes(@investments) end @@ -36,7 +36,7 @@ class Management::Budgets::InvestmentsController < Management::BaseController end def print - @investments = @investments.apply_filters_and_search(params).order(cached_votes_up: :desc).for_render.limit(15) + @investments = @investments.apply_filters_and_search(@budget, params).order(cached_votes_up: :desc).for_render.limit(15) load_investment_votes(@investments) end