Merge pull request #1490 from basecamp/remove-drafts

Remove drafts
This commit is contained in:
Jason Zimdars
2025-11-04 22:02:34 -06:00
committed by GitHub
9 changed files with 3 additions and 29 deletions
-8
View File
@@ -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,
+1 -2
View File
@@ -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 \
+1 -1
View File
@@ -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?
+1 -1
View File
@@ -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
-2
View File
@@ -1,7 +1,5 @@
<% cache card do %>
<section id="<%= dom_id(card, :card_container) %>" class="card-perma" style="--card-color: <%= card.color %>;">
<%= render "cards/container/status", card: card %>
<div class="card-perma__actions card-perma__actions--left">
<%= render "cards/container/gild", card: card if card.published? && !card.closed? %>
<%= render "cards/container/image", card: card %>
@@ -1,5 +0,0 @@
<% if card.drafted? && card.filled? %>
<div class="card__banner min-width max-width" style="--card-color: <%= card.color %>;">
<span class="overflow-ellipsis">Restored the draft you were working on</span>
</div>
<% end %>
@@ -5,9 +5,6 @@
<span class="card__meta-text card__meta-text--added">
Added <%= local_datetime_tag(card.created_at, style: :daysago) %>
<% if card.drafted? %>
<strong>(Draft)</strong>
<% end %>
</span>
<span class="card__meta-text card__meta-text--author">
@@ -5,9 +5,6 @@
<span class="card__meta-text card__meta-text--added">
Added <%= local_datetime_tag(card.created_at, style: :daysago) %>
<% if card.drafted? %>
<strong>(Draft)</strong>
<% end %>
</span>
<span class="card__meta-text card__meta-text--author">
-4
View File
@@ -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