Merge pull request #1324 from basecamp/make-drafts-visible-again

Make drafts visible again

app/assets/stylesheets/card-columns.css

@@ -416,6 +416,14 @@
       }
     }
 
+    .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,
@@ -570,14 +578,6 @@
       padding-block: 0 var(--card-padding-block);
     }
 
-    .card--drafted {
-      --card-color: var(--color-ink-medium) !important;
-
-      border-color: var(--card-color) !important;
-      border-style: dashed !important;
-      box-shadow: none !important;
-    }
-
     .card__people-label {
       display: none;
     }

app/models/filter.rb

@@ -18,7 +18,7 @@ class Filter < ApplicationRecord
 
   def cards
     @cards ||= begin
-      result = creator.accessible_cards.published
+      result = creator.accessible_cards.published_or_drafted_by(creator)
       result = result.indexed_by(indexed_by)
       result = result.sorted_by(sorted_by)
       result = result.where(id: card_ids) if card_ids.present?

test/models/filter_test.rb

@@ -34,7 +34,7 @@ class FilterTest < ActiveSupport::TestCase
 
     filter = users(:david).filters.new card_ids: [ cards(:logo, :layout).collect(&:id) ]
     cards(:logo).drafted!
-    assert_equal [ cards(:layout) ], filter.cards
+    assert_equal [ cards(:logo), cards(:layout) ], filter.cards
   end
 
   test "can't see cards in collections that aren't accessible" do