diff --git a/app/models/card/postponable.rb b/app/models/card/postponable.rb index 9ed1c9e46..a22dc3704 100644 --- a/app/models/card/postponable.rb +++ b/app/models/card/postponable.rb @@ -4,16 +4,16 @@ module Card::Postponable included do has_one :not_now, dependent: :destroy, class_name: "Card::NotNow" - scope :postponed, -> { open.joins(:not_now) } - scope :active, -> { open.where.missing(:not_now) } + scope :postponed, -> { open.published.joins(:not_now) } + scope :active, -> { open.published.where.missing(:not_now) } end def postponed? - not_now.present? + open? && published? && not_now.present? end def active? - !postponed? + open? && published? && !postponed? end def postpone diff --git a/app/views/collections/show/_columns.html.erb b/app/views/collections/show/_columns.html.erb index 0a1a67136..90348ccbd 100644 --- a/app/views/collections/show/_columns.html.erb +++ b/app/views/collections/show/_columns.html.erb @@ -5,7 +5,7 @@ <%= render "collections/show/not_now", collection: collection %> - <%= render "collections/show/stream", page: page %> + <%= render "collections/show/stream", page: page, collection: collection %>
Drag cards here
-