From 3d97708cc5b04a2b3982e06e6395eef44d0f4a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 24 Feb 2021 20:20:21 +0100 Subject: [PATCH] Simplify calls to filter_by --- app/controllers/concerns/commentable_actions.rb | 2 +- app/models/budget/investment.rb | 2 +- app/models/concerns/filterable.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb index 5523285bf..31ced92e1 100644 --- a/app/controllers/concerns/commentable_actions.rb +++ b/app/controllers/concerns/commentable_actions.rb @@ -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}") diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 092153eed..75e83f5ff 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -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 diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb index 9f86e6a9a..2e6469238 100644 --- a/app/models/concerns/filterable.rb +++ b/app/models/concerns/filterable.rb @@ -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