diff --git a/app/models/card/triageable.rb b/app/models/card/triageable.rb index 22e80a544..e806ea554 100644 --- a/app/models/card/triageable.rb +++ b/app/models/card/triageable.rb @@ -20,7 +20,7 @@ module Card::Triageable raise "The column must belong to the card collection" unless collection == column.collection transaction do - reopen + resume activity_spike&.destroy update! column: column end diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb index 32a1c2770..207e7c4c6 100644 --- a/app/views/collections/show.html.erb +++ b/app/views/collections/show.html.erb @@ -8,6 +8,8 @@ <% end %> <% content_for :header do %> + <%= render "filters/menu", user_filtering: @user_filtering %> +
<%= render "cards/webhooks", collection: @collection if Current.user.admin? %>
diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb index 9ceefcf7b..a600e7645 100644 --- a/app/views/filters/_settings.html.erb +++ b/app/views/filters/_settings.html.erb @@ -1,5 +1,4 @@ <% cache user_filtering do %> - <%= tag.aside id: "filter-settings", class: class_names("filters flex align-center gap-half justify-center center margin-block-end", { "filters--expanded": user_filtering.expanded? }), data: { @@ -7,7 +6,7 @@ toggle_class_toggle_class: "filters--expanded", filter_settings_filters_set_class: "filters--has-filters-set", filter_settings_no_filtering_url_value: no_filtering_url, - filter_settings_refresh_url_value: settings_refresh_path } do %>~ + filter_settings_refresh_url_value: settings_refresh_path } do %> <%= form_with url: cards_path, method: :get, class: "", data: { controller: "form", turbo_frame: "cards_container",