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/cards/_container.html.erb b/app/views/cards/_container.html.erb index 85116888e..add4b0049 100644 --- a/app/views/cards/_container.html.erb +++ b/app/views/cards/_container.html.erb @@ -20,9 +20,7 @@ <%= render "cards/container/title", card: card %> <%= render "cards/display/perma/steps", card: card %> - <% if card.published? %> - <%= render "cards/triage/columns", card: card if card.open? %> - <% end %> + <%= render "cards/triage/columns", card: card %>