From e97c085a57a9c623409c53d3928fcb35c02434e2 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@hey.com>
Date: Mon, 29 Sep 2025 18:42:29 +0200
Subject: [PATCH] Fix: proper filtering by collection in the collection perma

https://fizzy.37signals.com/5986089/cards/2020
---
 app/views/collections/show.html.erb        | 2 +-
 app/views/filters/_settings.html.erb       | 4 +++-
 app/views/filters/settings/_terms.html.erb | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index 3a4ee1c21..ed71b1395 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -24,7 +24,7 @@
 <% end %>
 
 <%= render "filters/settings", user_filtering: @user_filtering, no_filtering_url: collection_path(@collection) do |form| %>
-  <%= form.hidden_field "collection_ids", value: @collection.id %>
+  <%= hidden_field_tag "collection_ids[]", @collection.id %>
 <% end %>
 
 <%= tag.div data: {
diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index dd007ce59..538c766e5 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -21,7 +21,9 @@
       <%= yield form if block_given? %>
 
       <div class="flex-inline center align-center gap-half" data-controller="toggle-enable">
-        <%= render "filters/settings/terms", filter: user_filtering.filter, form: form %>
+        <%= render "filters/settings/terms", filter: user_filtering.filter, form: form do%>
+          <%= yield form if block_given? %>
+      <% end %>
         <%= render "filters/settings/controls", user_filtering: user_filtering, form: form %>
 
         <%= render "filters/settings/toggle", user_filtering: user_filtering %>
diff --git a/app/views/filters/settings/_terms.html.erb b/app/views/filters/settings/_terms.html.erb
index b090809fb..06e586df9 100644
--- a/app/views/filters/settings/_terms.html.erb
+++ b/app/views/filters/settings/_terms.html.erb
@@ -9,4 +9,6 @@
     <%= filter_chip_tag %Q("#{term}"), filter.as_params_without(:terms, term) %>
     <%= hidden_field_tag "terms[]", term, data: { filter_settings_target: "field" } %>
   <% end %>
+
+  <%= yield form if block_given? %>
 <% end %>