From a979daddf3a526c3129d69cfde43ee0685428df7 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Thu, 12 Jun 2025 12:39:33 +0200 Subject: [PATCH] Reuse filter scope --- app/controllers/cards/drops_controller.rb | 7 ++----- app/controllers/concerns/filter_scoped.rb | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/controllers/cards/drops_controller.rb b/app/controllers/cards/drops_controller.rb index b8937975e..81fbafb98 100644 --- a/app/controllers/cards/drops_controller.rb +++ b/app/controllers/cards/drops_controller.rb @@ -1,5 +1,6 @@ class Cards::DropsController < ApplicationController - before_action :set_filter, :set_card, :set_drop_target + include FilterScoped + before_action :set_card, :set_drop_target def create perform_drop_action @@ -9,10 +10,6 @@ class Cards::DropsController < ApplicationController private VALID_DROP_TARGETS = %w[ considering doing ] - def set_filter - @filter = Current.user.filters.from_params params.reverse_merge(**FilterScoped::DEFAULT_PARAMS).permit(*Filter::PERMITTED_PARAMS) - end - def set_card @card = Current.user.accessible_cards.find(params[:dropped_item_id]) end diff --git a/app/controllers/concerns/filter_scoped.rb b/app/controllers/concerns/filter_scoped.rb index 660365563..074dd967b 100644 --- a/app/controllers/concerns/filter_scoped.rb +++ b/app/controllers/concerns/filter_scoped.rb @@ -2,7 +2,7 @@ module FilterScoped extend ActiveSupport::Concern included do - before_action :set_filter, only: :index + before_action :set_filter end private