Simplify calls to filter_by

This commit is contained in:
Javi Martín
2021-02-24 20:20:21 +01:00
parent 9debf807b6
commit 3d97708cc5
3 changed files with 3 additions and 3 deletions

View File

@@ -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}")

View File

@@ -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

View File

@@ -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