diff --git a/app/models/user/filtering.rb b/app/models/user/filtering.rb index 218b8875a..4195bf7a6 100644 --- a/app/models/user/filtering.rb +++ b/app/models/user/filtering.rb @@ -83,6 +83,11 @@ class User::Filtering end end + def single_collection_or_first + # Default to the first selected or, when no selection, to the first one + filter.collections.first || collections.first + end + def cache_key ActiveSupport::Cache.expand_cache_key([ user, filter, expanded? ], "user-filtering") end diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb index 172a19d7e..dcc0101c7 100644 --- a/app/views/events/index.html.erb +++ b/app/views/events/index.html.erb @@ -5,7 +5,7 @@ <% content_for :header do %> <%= render "filters/menu", user_filtering: @user_filtering %> - <%= render "filters/menu/add_card_button", user_filtering: @user_filtering %> + <%= render "events/index/add_card_button", user_filtering: @user_filtering %>

diff --git a/app/views/filters/menu/_add_card_button.html.erb b/app/views/events/index/_add_card_button.html.erb similarity index 79% rename from app/views/filters/menu/_add_card_button.html.erb rename to app/views/events/index/_add_card_button.html.erb index e5e6f6368..55e8ec023 100644 --- a/app/views/filters/menu/_add_card_button.html.erb +++ b/app/views/events/index/_add_card_button.html.erb @@ -1,5 +1,5 @@
- <% if collection = user_filtering.single_collection %> + <% if collection = user_filtering.single_collection_or_first %> <%= button_to collection_cards_path(collection), method: :post, class: "btn btn--link btn--circle-mobile" do %> <%= icon_tag "add" %> Add a card