consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2723 from wairbut-m2c/backport_2400_combine_free_text_search_and_filters

Browse Source 
Combine text search and filters for Investments on Admin panel
This commit is contained in:
Alberto
2018-07-25 14:42:19 +02:00
committed by GitHub
parent 3528f09202 53a1ea8847
commit 61589122ef
8 changed files with 247 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/admin/budget_investments_controller.rb
View File

@@ -84,12 +84,8 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
end
def load_investments
@investments = if params[:title_or_id].present?
Budget::Investment.search_by_title_or_id(params)
else
Budget::Investment.scoped_filter(params, @current_filter)
.order(sort_by(params[:sort_by]))
end
@investments = Budget::Investment.scoped_filter(params, @current_filter)
.order(sort_by(params[:sort_by]))
@investments = @investments.page(params[:page]) unless request.format.csv?
end