From df640d50e56c302de0706b921152ded4b53dc2b4 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 4 Nov 2025 21:53:37 -0600 Subject: [PATCH 1/6] Don't add draft status to cards --- app/assets/stylesheets/card-columns.css | 8 -------- app/helpers/cards_helper.rb | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index 2e38b9447..eebbb74f9 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -441,14 +441,6 @@ } } - .card--drafted { - --card-color: var(--color-ink-medium) !important; - - border-color: var(--card-color) !important; - border-style: dashed !important; - box-shadow: none !important; - } - .card:has(.card__background img:not([src=""])) { .card__content, .card__meta, diff --git a/app/helpers/cards_helper.rb b/app/helpers/cards_helper.rb index 5a4a35d62..2b67f8750 100644 --- a/app/helpers/cards_helper.rb +++ b/app/helpers/cards_helper.rb @@ -4,8 +4,7 @@ module CardsHelper options.delete(:class), ("golden-effect" if card.golden?), ("card--postponed" if card.postponed?), - ("card--active" if card.active?), - ("card--drafted" if card.drafted?) + ("card--active" if card.active?) ].compact.join(" ") tag.article \ From 1fcf28abcf4aa20a15b764a54054056f765c55ff Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 4 Nov 2025 21:53:50 -0600 Subject: [PATCH 2/6] Don't include drafted cards in filtered views --- app/models/filter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/filter.rb b/app/models/filter.rb index ca14629a9..903007c9f 100644 --- a/app/models/filter.rb +++ b/app/models/filter.rb @@ -18,7 +18,7 @@ class Filter < ApplicationRecord def cards @cards ||= begin - result = creator.accessible_cards.published_or_drafted_by(creator) + result = creator.accessible_cards.published result = result.indexed_by(indexed_by) result = result.sorted_by(sorted_by) result = result.where(id: card_ids) if card_ids.present? From b826eb47fe6f549cfb1cc4a3f28467b34e104b16 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 4 Nov 2025 21:54:14 -0600 Subject: [PATCH 3/6] Remove draft restoration notice We don't need to announce that there is autosaved content --- app/views/cards/_container.html.erb | 2 -- app/views/cards/container/_status.html.erb | 5 ----- 2 files changed, 7 deletions(-) delete mode 100644 app/views/cards/container/_status.html.erb diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb index 3914f93ff..935bd05ec 100644 --- a/app/views/cards/_container.html.erb +++ b/app/views/cards/_container.html.erb @@ -1,7 +1,5 @@ <% cache card do %>
- <%= render "cards/container/status", card: card %> -
<%= render "cards/container/gild", card: card if card.published? && !card.closed? %> <%= render "cards/container/image", card: card %> diff --git a/app/views/cards/container/_status.html.erb b/app/views/cards/container/_status.html.erb deleted file mode 100644 index 043e35dc0..000000000 --- a/app/views/cards/container/_status.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% if card.drafted? && card.filled? %> -
- Restored the draft you were working on -
-<% end %> From 81ec0154eaa417fb27164b2d37fc8d002c9f6177 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 4 Nov 2025 21:55:36 -0600 Subject: [PATCH 4/6] Don't indicate drafts in preview cards --- app/views/cards/display/common/_meta.html.erb | 3 --- app/views/cards/display/public_preview/_meta.html.erb | 3 --- 2 files changed, 6 deletions(-) diff --git a/app/views/cards/display/common/_meta.html.erb b/app/views/cards/display/common/_meta.html.erb index dd2d8efbd..27a8c9cf7 100644 --- a/app/views/cards/display/common/_meta.html.erb +++ b/app/views/cards/display/common/_meta.html.erb @@ -5,9 +5,6 @@ Added <%= local_datetime_tag(card.created_at, style: :daysago) %> - <% if card.drafted? %> - (Draft) - <% end %> diff --git a/app/views/cards/display/public_preview/_meta.html.erb b/app/views/cards/display/public_preview/_meta.html.erb index 479f11432..948a6e73c 100644 --- a/app/views/cards/display/public_preview/_meta.html.erb +++ b/app/views/cards/display/public_preview/_meta.html.erb @@ -5,9 +5,6 @@ Added <%= local_datetime_tag(card.created_at, style: :daysago) %> - <% if card.drafted? %> - (Draft) - <% end %> From aac63499990fd4b9cacd153037eba3e53ff428cc Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 4 Nov 2025 21:56:25 -0600 Subject: [PATCH 5/6] Remove draft status filter --- app/models/filter/fields.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/filter/fields.rb b/app/models/filter/fields.rb index c24ed74c8..c44dff996 100644 --- a/app/models/filter/fields.rb +++ b/app/models/filter/fields.rb @@ -1,7 +1,7 @@ module Filter::Fields extend ActiveSupport::Concern - INDEXES = %w[ all closed not_now stalled postponing_soon golden draft ] + INDEXES = %w[ all closed not_now stalled postponing_soon golden ] SORTED_BY = %w[ newest oldest latest ] delegate :default_value?, to: :class From 1f1303b7a6b988675e3dca1819defb8bcef44d45 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Tue, 4 Nov 2025 21:59:55 -0600 Subject: [PATCH 6/6] Don't test for the draft status filter, it's gone --- test/models/filter_test.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/models/filter_test.rb b/test/models/filter_test.rb index fab856b87..ceda6943c 100644 --- a/test/models/filter_test.rb +++ b/test/models/filter_test.rb @@ -31,10 +31,6 @@ class FilterTest < ActiveSupport::TestCase filter = users(:david).filters.new card_ids: [ cards(:logo, :layout).collect(&:id) ] assert_equal [ cards(:logo), cards(:layout) ], filter.cards - - filter = users(:david).filters.new card_ids: [ cards(:logo, :layout).collect(&:id) ] - cards(:logo).drafted! - assert_equal [ cards(:logo), cards(:layout) ], filter.cards end test "can't see cards in collections that aren't accessible" do