From 6fb0d880792f9a39eb5dfc9c9b9cc4f8bbc43c2c Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Fri, 25 Apr 2025 07:54:32 +0200 Subject: [PATCH] Tidy up --- .../concerns/day_timelines_scoped.rb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/controllers/concerns/day_timelines_scoped.rb b/app/controllers/concerns/day_timelines_scoped.rb index abb92b0d2..d7bf80a5a 100644 --- a/app/controllers/concerns/day_timelines_scoped.rb +++ b/app/controllers/concerns/day_timelines_scoped.rb @@ -4,16 +4,17 @@ module DayTimelinesScoped included do include FilterScoped - before_action :restore_collections_filter, :set_day_timeline + before_action :restore_collections_filter_from_cookie + before_action :set_day_timeline + after_action :save_collections_filter_to_cookie end private - def restore_collections_filter + def restore_collections_filter_from_cookie if params[:clear_filter] delete_collections_filter_cookie else - set_collections_filter_from_cookie if should_restore_collections_filter_from_cookie? - save_collections_filter_to_cookie + set_collections_filter_from_cookie end end @@ -22,11 +23,9 @@ module DayTimelinesScoped end def set_collections_filter_from_cookie - @filter.collection_ids = cookies[:collection_filter].split(",") - end - - def should_restore_collections_filter_from_cookie? - cookies[:collection_filter].present? && @filter.collections.blank? + if cookies[:collection_filter].present? && @filter.collections.blank? + @filter.collection_ids = cookies[:collection_filter].split(",") + end end def save_collections_filter_to_cookie