Simplify calls to filter_by
This commit is contained in:
@@ -9,7 +9,7 @@ module CommentableActions
|
||||
|
||||
@resources = @current_order == "recommendations" && current_user.present? ? @resources.recommendations(current_user) : @resources.for_render
|
||||
@resources = @resources.search(@search_terms) if @search_terms.present?
|
||||
@resources = @advanced_search_terms.present? ? @resources.filter_by(@advanced_search_terms) : @resources
|
||||
@resources = @resources.filter_by(@advanced_search_terms)
|
||||
|
||||
@resources = @resources.page(params[:page]).send("sort_by_#{@current_order}")
|
||||
|
||||
|
||||
@@ -358,7 +358,7 @@ class Budget
|
||||
investments = investments.send(current_filter) if current_filter.present?
|
||||
investments = investments.by_heading(params[:heading_id]) if params[:heading_id].present?
|
||||
investments = investments.search(params[:search]) if params[:search].present?
|
||||
investments = investments.filter_by(params[:advanced_search]) if params[:advanced_search].present?
|
||||
investments = investments.filter_by(params[:advanced_search])
|
||||
investments
|
||||
end
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ module Filterable
|
||||
class_methods do
|
||||
def filter_by(params)
|
||||
resources = all
|
||||
params.each do |filter, value|
|
||||
(params.presence || {}).each do |filter, value|
|
||||
if allowed_filter?(filter, value)
|
||||
resources = resources.send("by_#{filter}", value)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user