From 63a098fcdbf15cc3a58247aec372a72550ecba7d Mon Sep 17 00:00:00 2001
From: Bruno Prieto <bruno@37signals.com>
Date: Thu, 13 Mar 2025 23:44:05 +0100
Subject: [PATCH] Fix filter input and label id assigments

---
 app/views/filters/_assignees.html.erb |  7 ++++---
 app/views/filters/_buckets.html.erb   |  5 +++--
 app/views/filters/_creators.html.erb  | 10 ++++++----
 app/views/filters/_stages.html.erb    |  5 +++--
 app/views/filters/_tags.html.erb      |  5 +++--
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/views/filters/_assignees.html.erb b/app/views/filters/_assignees.html.erb
index 580156429..8dfdc7f9d 100644
--- a/app/views/filters/_assignees.html.erb
+++ b/app/views/filters/_assignees.html.erb
@@ -26,7 +26,7 @@
       <% end %>
 
       <div class="btn popup__item">
-        <%= form.check_box "assignment_status", { 
+        <%= form.check_box :assignment_status, {
           checked: filter.assignment_status.unassigned?,
           data: { action: "change->form#submit" },
           include_hidden: false,
@@ -38,13 +38,14 @@
 
       <% Current.account.users.active.order(:name).each do |user| %>
         <div class="btn popup__item">
-          <%= form.check_box "assignee_ids[]", { 
+          <%= form.check_box :assignee_ids, {
+            multiple: true,
             checked: filter.assignees.include?(user),
             data: { action: "change->form#submit" },
             include_hidden: false,
           }, user.id %>
 
-          <%= form.label "assignee_ids[]", user.name, for: dom_id(user, :filter), class: "overflow-ellipsis" %>
+          <%= form.label :assignee_ids, user.name, for: form.field_id(:assignee_ids, user.id), class: "overflow-ellipsis" %>
           <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
         </div>
       <% end %>
diff --git a/app/views/filters/_buckets.html.erb b/app/views/filters/_buckets.html.erb
index bc2fb0d58..1142a9c96 100644
--- a/app/views/filters/_buckets.html.erb
+++ b/app/views/filters/_buckets.html.erb
@@ -26,13 +26,14 @@
 
         <% filter.buckets.order(:name).each do |bucket| %>
           <div class="btn popup__item">
-            <%= form.check_box "bucket_ids[]", { 
+            <%= form.check_box :bucket_ids, {
+              multiple: true,
               checked: filter.buckets.include?(bucket),
               data: { action: "change->form#submit" },
               include_hidden: false,
             }, bucket.id %>
 
-            <%= form.label "bucket_ids[]", bucket.name, for: dom_id(bucket, :filter), class: "overflow-ellipsis" %>
+            <%= form.label :bucket_ids, bucket.name, for: form.field_id(:bucket_ids, bucket.id), class: "overflow-ellipsis" %>
             <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
           </div>
         <% end %>
diff --git a/app/views/filters/_creators.html.erb b/app/views/filters/_creators.html.erb
index b30bd52c0..83fc7c69f 100644
--- a/app/views/filters/_creators.html.erb
+++ b/app/views/filters/_creators.html.erb
@@ -26,25 +26,27 @@
         <% end %>
 
         <div class="btn popup__item">
-          <%= form.check_box "creator_ids[]", { 
+          <%= form.check_box :creator_ids, {
+            multiple: true,
             checked: filter.creators.include?(Current.user),
             data: { action: "change->form#submit" },
             include_hidden: false,
           }, Current.user.id %>
 
-          <%= form.label "creator_ids[]", "Me", for: dom_id(Current.user, :creator_filter), class: "overflow-ellipsis" %>
+          <%= form.label :creator_ids, "Me", for: form.field_id(:creator_ids, Current.user.id), class: "overflow-ellipsis" %>
           <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
         </div>
 
         <% Current.account.users.active.without(Current.user).order(:name).each do |user| %>
           <div class="btn popup__item">
-            <%= form.check_box "creator_ids[]", { 
+            <%= form.check_box :creator_ids, {
+              multiple: true,
               checked: filter.creators.include?(user),
               data: { action: "change->form#submit" },
               include_hidden: false,
             }, user.id %>
 
-            <%= form.label "creator_ids[]", user.name, for: dom_id(user, :creator_filter), class: "overflow-ellipsis" %>
+            <%= form.label :creator_ids, user.name, for: form.field_id(:creator_ids, user.id), class: "overflow-ellipsis" %>
             <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
           </div>
         <% end %>
diff --git a/app/views/filters/_stages.html.erb b/app/views/filters/_stages.html.erb
index b3498a7f8..0583a8ffa 100644
--- a/app/views/filters/_stages.html.erb
+++ b/app/views/filters/_stages.html.erb
@@ -29,13 +29,14 @@
 
           <% workflow.stages.order(:name).each do |stage| %>
             <div class="btn popup__item">
-              <%= form.check_box "stage_ids[]", { 
+              <%= form.check_box :stage_ids, {
+                multiple: true,
                 checked: filter.stages.include?(stage),
                 data: { action: "change->form#submit" },
                 include_hidden: false,
             }, stage.id %>
 
-              <%= form.label "stage_ids[]", stage.name, for: dom_id(stage, :filter), class: "overflow-ellipsis" %>
+              <%= form.label :stage_ids, stage.name, for: form.field_id(:stage_ids, stage.id), class: "overflow-ellipsis" %>
               <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
             </div>
           <% end %>
diff --git a/app/views/filters/_tags.html.erb b/app/views/filters/_tags.html.erb
index 5af5ba171..083e390cc 100644
--- a/app/views/filters/_tags.html.erb
+++ b/app/views/filters/_tags.html.erb
@@ -25,13 +25,14 @@
 
       <% Current.account.tags.order(:title).each do |tag| %>
         <div class="btn popup__item">
-          <%= form.check_box "tag_ids[]", { 
+          <%= form.check_box :tag_ids, {
+            multiple: true,
             checked: filter.tags.include?(tag),
             data: { action: "change->form#submit" },
             include_hidden: false,
           }, tag.id %>
 
-          <%= form.label "tag_ids[]", tag.hashtag, for: dom_id(tag, :filter), class: "overflow-ellipsis" %>
+          <%= form.label :tag_ids, tag.hashtag, for: form.field_id(:tag_ids, tag.id), class: "overflow-ellipsis" %>
           <%= image_tag "check.svg", aria: { hidden: true }, size: 18, class: "checked flex-item-justify-end" %>
         </div>
       <% end %>