From af6e0540292e273cca9b345a9d5b96ccceb12c08 Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Wed, 15 Jul 2020 16:03:24 +0200 Subject: [PATCH] Do not freeze common_search_filter_includes That way we can add more custom filters to the search without overwriting the method --- app/controllers/alchemy/admin/resources_controller.rb | 6 +++--- .../alchemy/admin/resources_controller_spec.rb | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/controllers/alchemy/admin/resources_controller.rb b/app/controllers/alchemy/admin/resources_controller.rb index 4bbf962c89..e1683c1696 100644 --- a/app/controllers/alchemy/admin/resources_controller.rb +++ b/app/controllers/alchemy/admin/resources_controller.rb @@ -148,15 +148,15 @@ def search_filter_params def common_search_filter_includes [ - {q: [ + { q: [ resource_handler.search_field_name, :s, - ]}, + ] }, :tagged_with, :filter, :page, :per_page, - ].freeze + ] end def items_per_page diff --git a/spec/controllers/alchemy/admin/resources_controller_spec.rb b/spec/controllers/alchemy/admin/resources_controller_spec.rb index 349e6d4096..b8bb7299a1 100644 --- a/spec/controllers/alchemy/admin/resources_controller_spec.rb +++ b/spec/controllers/alchemy/admin/resources_controller_spec.rb @@ -149,4 +149,14 @@ def resource_handler end end end + + describe "#common_search_filter_includes" do + before do + allow(controller).to receive(:alchemy_module) { { name: "events" } } + end + + it "should not be frozen" do + expect(controller.send(:common_search_filter_includes)).to_not be_frozen + end + end end