From 2ab737b032a8bd2d6e1dd39574f06274e3fe23de Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 29 Oct 2025 16:07:29 -0500 Subject: [PATCH] Open should mean everything except closed and not now --- app/models/filter.rb | 5 +++++ app/views/filters/settings/_indexed_by.html.erb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/filter.rb b/app/models/filter.rb index 6218dbbaa..ca14629a9 100644 --- a/app/models/filter.rb +++ b/app/models/filter.rb @@ -22,6 +22,7 @@ class Filter < ApplicationRecord result = result.indexed_by(indexed_by) result = result.sorted_by(sorted_by) result = result.where(id: card_ids) if card_ids.present? + result = result.where.missing(:not_now) unless include_not_now_cards? result = result.open unless include_closed_cards? result = result.unassigned if assignment_status.unassigned? result = result.assigned_to(assignees.ids) if assignees.present? @@ -67,4 +68,8 @@ class Filter < ApplicationRecord def include_closed_cards? only_closed? || card_ids.present? || creator_ids.present? end + + def include_not_now_cards? + indexed_by.not_now? || card_ids.present? + end end diff --git a/app/views/filters/settings/_indexed_by.html.erb b/app/views/filters/settings/_indexed_by.html.erb index 2a990e66b..f75419058 100644 --- a/app/views/filters/settings/_indexed_by.html.erb +++ b/app/views/filters/settings/_indexed_by.html.erb @@ -23,7 +23,7 @@ <% Filter::INDEXES.each do |index| %> <%= tag.li class: "popup__item", data: { navigable_list_target: "item", combobox_target: "item", combobox_value: index, combobox_label: index.humanize }, role: "checkbox", aria: { checked: filter.indexed_by == index } do %> <% end %>