diff --git a/app/controllers/collections/columns/closeds_controller.rb b/app/controllers/collections/columns/closeds_controller.rb new file mode 100644 index 000000000..9dd830723 --- /dev/null +++ b/app/controllers/collections/columns/closeds_controller.rb @@ -0,0 +1,7 @@ +class Collections::Columns::ClosedsController < ApplicationController + include CollectionScoped + + def show + set_page_and_extract_portion_from @collection.cards.closed.recently_closed_first + end +end diff --git a/app/controllers/columns/cards/drops/closures_controller.rb b/app/controllers/columns/cards/drops/closures_controller.rb index e8dca094b..fc31ee553 100644 --- a/app/controllers/columns/cards/drops/closures_controller.rb +++ b/app/controllers/columns/cards/drops/closures_controller.rb @@ -2,5 +2,8 @@ class Columns::Cards::Drops::ClosuresController < ApplicationController include CardScoped def create + @card.close + + render turbo_stream: turbo_stream.replace("closed-cards", partial: "collections/show/closed", locals: { collection: @card.collection }) end -end \ No newline at end of file +end diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb index 48f0839df..f9b045239 100644 --- a/app/models/card/closeable.rb +++ b/app/models/card/closeable.rb @@ -31,7 +31,6 @@ module Card::Closeable def close(user: Current.user, reason: Closure::Reason.default) unless closed? transaction do - resume create_closure! user: user, reason: reason track_event :closed, creator: user end @@ -41,7 +40,6 @@ module Card::Closeable def reopen(user: Current.user) if closed? transaction do - resume closure&.destroy track_event :reopened, creator: user end diff --git a/app/models/card/postponable.rb b/app/models/card/postponable.rb index a150fc413..82e30a7bc 100644 --- a/app/models/card/postponable.rb +++ b/app/models/card/postponable.rb @@ -17,23 +17,19 @@ module Card::Postponable end def postpone - unless postponed? - transaction do - send_back_to_triage - reopen - activity_spike&.destroy - create_not_now! - end + transaction do + send_back_to_triage + reopen + activity_spike&.destroy + create_not_now! unless postponed? end end def resume - if postponed? - transaction do - reopen - activity_spike&.destroy - not_now.destroy - end + transaction do + reopen + activity_spike&.destroy + not_now&.destroy end end end diff --git a/app/views/collections/columns/closeds/show.html.erb b/app/views/collections/columns/closeds/show.html.erb new file mode 100644 index 000000000..1d5267c9a --- /dev/null +++ b/app/views/collections/columns/closeds/show.html.erb @@ -0,0 +1,14 @@ +<%= turbo_frame_tag :closed_column do %> + <% if @page.used? %> + <%= render "collections/columns/list", cards: @page.records, draggable: true %> + + <% unless @page.last? %> +
Drag cards here
+