From 941aa68e69a17e98f331c6cda894a8fe1c556b49 Mon Sep 17 00:00:00 2001 From: nicolachr Date: Thu, 30 Apr 2026 15:38:00 +0300 Subject: [PATCH 01/18] Add move to list option in card --- app/controllers/cards_controller.rb | 19 +++++++++++++++++++ app/views/cards/_actions.html.erb | 14 ++++++++++++++ app/views/cards/show.html.erb | 2 +- config/routes.rb | 5 ++++- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb index 8b5a381d8b..9c6acf9e66 100644 --- a/app/controllers/cards_controller.rb +++ b/app/controllers/cards_controller.rb @@ -52,6 +52,25 @@ def update end end + def move_to_list + target_list = @board.lists.find(params[:new_list_id]) + + Card.transaction do + # Repair the source list chain before changing list_id, + # since next_card scopes to self.list + if (next_card = @card.next_card) + next_card.update_attribute(:previous_id, @card.previous_id) + end + + @card.list_id = target_list.id + @card.previous_id = target_list.last_card&.id + @card.save + end + + track_updated(@card) + redirect_to [current_project, @board, target_list, @card], notice: 'Task moved.' + end + def move List.move(@card, prev_item: @prev_item, next_item: @next_item) diff --git a/app/views/cards/_actions.html.erb b/app/views/cards/_actions.html.erb index fc4a033fd9..6213a7180c 100644 --- a/app/views/cards/_actions.html.erb +++ b/app/views/cards/_actions.html.erb @@ -19,6 +19,20 @@ <%= link_to(project_board_list_card_revisions_path(current_project, @board, @list, @card), class: 'dropdown-item') do %> View History <% end %> + <% other_lists = @board.ordered_lists.reject { |l| l.id == @list.id } %> + <% if other_lists.any? %> +
+ Move to list + <% other_lists.each do |list| %> + <%= link_to( + move_to_list_project_board_list_card_path(current_project, @board, @list, @card, new_list_id: list.id), + method: :post, + class: 'dropdown-item' + ) do %> + <%= list.name %> + <% end %> + <% end %> + <% end %> diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index 362db0a04c..0711a689ab 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -22,7 +22,7 @@
- <% cache ['card-information-tab', @card] do %> + <% cache ['card-information-tab', @card, @board.lists.maximum(:updated_at)] do %>

<%= @card.name %> diff --git a/config/routes.rb b/config/routes.rb index c7b3057e88..01591a6789 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -49,7 +49,10 @@ resources :lists, except: [:index] do member { post :move } resources :cards, except: [:index] do - member { post :move } + member do + post :move + post :move_to_list + end resources :revisions, only: [:index, :show] end end From abf51e42c2a4189c873648444c338fe95df6fe0e Mon Sep 17 00:00:00 2001 From: nicolachr Date: Thu, 30 Apr 2026 15:49:19 +0300 Subject: [PATCH 02/18] Add specs --- spec/requests/cards/move_to_list_spec.rb | 69 ++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 spec/requests/cards/move_to_list_spec.rb diff --git a/spec/requests/cards/move_to_list_spec.rb b/spec/requests/cards/move_to_list_spec.rb new file mode 100644 index 0000000000..3688b71191 --- /dev/null +++ b/spec/requests/cards/move_to_list_spec.rb @@ -0,0 +1,69 @@ +require 'rails_helper' + +describe 'cards#move_to_list' do + before { login_to_project_as_user } + + let(:board) { create(:board, node: current_project.methodology_library, project: current_project) } + let(:source_list) { create(:list, board: board) } + let(:target_list) { create(:list, board: board, previous_id: source_list.id) } + + let(:card_a) { create(:card, list: source_list) } + let(:card_b) { create(:card, list: source_list, previous_id: card_a.id) } + let(:card_c) { create(:card, list: source_list, previous_id: card_b.id) } + + let(:last_card_in_target) { create(:card, list: target_list) } + + let(:submit) do + post move_to_list_project_board_list_card_path(current_project, board, source_list, card_b), + params: { new_list_id: target_list.id } + end + + before do + card_a + card_b + card_c + last_card_in_target + end + + it 'moves the card to the target list' do + submit + expect(card_b.reload.list).to eq(target_list) + end + + it 'appends the card to the end of the target list' do + submit + expect(card_b.reload.previous_id).to eq(last_card_in_target.id) + end + + it 'repairs the source list chain' do + submit + expect(card_c.reload.previous_id).to eq(card_a.id) + end + + it 'redirects to the card in its new list with a notice' do + submit + expect(response).to redirect_to(project_board_list_card_path(current_project, board, target_list, card_b)) + expect(flash[:notice]).to eq('Task moved.') + end + + it 'creates an activity' do + expect { submit }.to have_enqueued_job(ActivityTrackingJob).with( + action: 'update', + project_id: current_project.id, + trackable_id: card_b.id, + trackable_type: 'Card', + user_id: @logged_in_as.id + ) + end + + context 'when the target list is empty' do + let(:last_card_in_target) { nil } + + before { target_list } + + it 'makes the card the first item in the target list' do + submit + expect(card_b.reload.previous_id).to be_nil + end + end +end From d67902ab018d6af92df07292ea5b331d395f9fe0 Mon Sep 17 00:00:00 2001 From: nicolachr Date: Thu, 30 Apr 2026 15:51:03 +0300 Subject: [PATCH 03/18] Add CHANGELOG entry --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 3a805aa5f4..0810071a4e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ [v#.#.#] ([month] [YYYY]) - [entity]: - [future tense verb] [feature] + - Cards: add option to move a task to a different list - Mail: add support for SMTP configuration via environment variables for Docker deployments; smtp.yml remains supported for VM deployments during the deprecation transition - Upgraded gems: - [gem] From 7b8fab700126191f3e8656264df7ae1a8b51aecd Mon Sep 17 00:00:00 2001 From: nicolachr Date: Thu, 7 May 2026 15:06:44 +0300 Subject: [PATCH 04/18] Move inline with other actions --- app/assets/stylesheets/hera/modules.scss | 4 --- app/views/cards/_actions.html.erb | 31 +++++++++++++----------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/hera/modules.scss b/app/assets/stylesheets/hera/modules.scss index bf45692858..c23cbfc2ab 100644 --- a/app/assets/stylesheets/hera/modules.scss +++ b/app/assets/stylesheets/hera/modules.scss @@ -198,10 +198,6 @@ margin-left: auto; .action { - &:not(:first-child)::before { - content: '-'; - } - &:first-child { margin-left: auto; } diff --git a/app/views/cards/_actions.html.erb b/app/views/cards/_actions.html.erb index 6213a7180c..6400a28c09 100644 --- a/app/views/cards/_actions.html.erb +++ b/app/views/cards/_actions.html.erb @@ -1,4 +1,21 @@
+ <% other_lists = @board.ordered_lists.reject { |l| l.id == @list.id } %> + <% if other_lists.any? %> + + <%= @list.name %> +
+ <% other_lists.each do |list| %> + <%= link_to( + move_to_list_project_board_list_card_path(current_project, @board, @list, @card, new_list_id: list.id), + method: :post, + class: 'dropdown-item' + ) do %> + <%= list.name %> + <% end %> + <% end %> +
+ + <% end %> <%= link_to edit_project_board_list_card_path(current_project, @board, @list, @card) do %> Edit @@ -19,20 +36,6 @@ <%= link_to(project_board_list_card_revisions_path(current_project, @board, @list, @card), class: 'dropdown-item') do %> View History <% end %> - <% other_lists = @board.ordered_lists.reject { |l| l.id == @list.id } %> - <% if other_lists.any? %> -
- Move to list - <% other_lists.each do |list| %> - <%= link_to( - move_to_list_project_board_list_card_path(current_project, @board, @list, @card, new_list_id: list.id), - method: :post, - class: 'dropdown-item' - ) do %> - <%= list.name %> - <% end %> - <% end %> - <% end %>

From 4b709e47309e84d6181e5fa0ac8d6ef8b41aab9f Mon Sep 17 00:00:00 2001 From: nicolachr Date: Thu, 7 May 2026 15:35:48 +0300 Subject: [PATCH 05/18] Address APR findings --- app/controllers/cards_controller.rb | 10 ++++-- app/models/card.rb | 11 ++++++ config/initializers/activity_service.rb | 1 + spec/requests/cards/move_to_list_spec.rb | 45 +++++++++++++++++++++++- 4 files changed, 64 insertions(+), 3 deletions(-) diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb index 9c6acf9e66..a851ecc6b5 100644 --- a/app/controllers/cards_controller.rb +++ b/app/controllers/cards_controller.rb @@ -1,6 +1,7 @@ class CardsController < AuthenticatedController include ActivityTracking include ContentFromTemplate + include EventPublisher include Mentioned include NotificationsReader include ProjectScoped @@ -55,6 +56,11 @@ def update def move_to_list target_list = @board.lists.find(params[:new_list_id]) + if target_list.id == @card.list_id + redirect_to [current_project, @board, @list, @card], alert: 'Task is already in that list.' + return + end + Card.transaction do # Repair the source list chain before changing list_id, # since next_card scopes to self.list @@ -64,10 +70,10 @@ def move_to_list @card.list_id = target_list.id @card.previous_id = target_list.last_card&.id - @card.save + @card.save! end - track_updated(@card) + publish_event('card.updated', @card.to_event_payload) redirect_to [current_project, @board, target_list, @card], notice: 'Task moved.' end diff --git a/app/models/card.rb b/app/models/card.rb index b0dd2ac557..b162935817 100644 --- a/app/models/card.rb +++ b/app/models/card.rb @@ -1,5 +1,6 @@ class Card < ApplicationRecord include Commentable + include Eventable include HasFields include RevisionTracking include Subscribable @@ -84,6 +85,16 @@ def to_xml(xml_builder, includes: [], version: 3) end end + def local_event_payload + { + project: { + id: project.id, + name: project.name + }, + title: name + } + end + def local_fields { 'List' => list.name.parameterize(preserve_case: true, separator: '_'), diff --git a/config/initializers/activity_service.rb b/config/initializers/activity_service.rb index 99a3f56bfe..383ef9b623 100644 --- a/config/initializers/activity_service.rb +++ b/config/initializers/activity_service.rb @@ -1,5 +1,6 @@ Rails.application.reloader.to_prepare do ActivityService.configure do |activity_service| + activity_service.subscribe_namespace 'card' activity_service.subscribe_namespace 'inline_thread' activity_service.subscribe_namespace 'issue' end diff --git a/spec/requests/cards/move_to_list_spec.rb b/spec/requests/cards/move_to_list_spec.rb index 3688b71191..08ed17b4bb 100644 --- a/spec/requests/cards/move_to_list_spec.rb +++ b/spec/requests/cards/move_to_list_spec.rb @@ -48,7 +48,7 @@ it 'creates an activity' do expect { submit }.to have_enqueued_job(ActivityTrackingJob).with( - action: 'update', + action: 'move_to_list', project_id: current_project.id, trackable_id: card_b.id, trackable_type: 'Card', @@ -56,6 +56,49 @@ ) end + context 'when moving the first card in the source list' do + let(:submit) do + post move_to_list_project_board_list_card_path(current_project, board, source_list, card_a), + params: { new_list_id: target_list.id } + end + + it 'promotes the next card to list head' do + submit + expect(card_b.reload.previous_id).to be_nil + end + end + + context 'when moving the last card in the source list' do + let(:submit) do + post move_to_list_project_board_list_card_path(current_project, board, source_list, card_c), + params: { new_list_id: target_list.id } + end + + it 'leaves the remaining chain intact' do + submit + expect(card_b.reload.previous_id).to eq(card_a.id) + end + end + + context 'when the target list is the same as the source list' do + let(:submit) do + post move_to_list_project_board_list_card_path(current_project, board, source_list, card_c), + params: { new_list_id: source_list.id } + end + + it 'does not change the card' do + original_previous_id = card_c.previous_id + submit + expect(card_c.reload.previous_id).to eq(original_previous_id) + end + + it 'redirects with an alert' do + submit + expect(response).to redirect_to(project_board_list_card_path(current_project, board, source_list, card_c)) + expect(flash[:alert]).to eq('Task is already in that list.') + end + end + context 'when the target list is empty' do let(:last_card_in_target) { nil } From 746bb5141764a1abb3cc3cc2d95ae6cd3e59720e Mon Sep 17 00:00:00 2001 From: nicolachr Date: Tue, 12 May 2026 15:14:23 +0300 Subject: [PATCH 06/18] track card list moves in the activity feed Activities were silently dropped because 'move_to_list' was not in Activity::VALID_ACTIONS, causing ActivityTrackingJob to fail validation. --- app/models/activity.rb | 2 +- app/presenters/activity_presenter.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/activity.rb b/app/models/activity.rb index 25acbdc277..e365f67601 100644 --- a/app/models/activity.rb +++ b/app/models/activity.rb @@ -17,7 +17,7 @@ def project=(new_project); end validates_presence_of :action, :trackable_id, :trackable_type, :user - VALID_ACTIONS = %w[create destroy download recover reopen resolve state_change update] + VALID_ACTIONS = %w[create destroy download move_to_list recover reopen resolve state_change update] validates_inclusion_of :action, in: VALID_ACTIONS diff --git a/app/presenters/activity_presenter.rb b/app/presenters/activity_presenter.rb index f406aef18f..4981389acd 100644 --- a/app/presenters/activity_presenter.rb +++ b/app/presenters/activity_presenter.rb @@ -83,6 +83,8 @@ def verb case activity.action when 'destroy' 'deleted' + when 'move_to_list' + 'moved' when 'state_change' 'updated' else From c9e6ed0f11e65aafd4466d8f21a6d9214cc680f0 Mon Sep 17 00:00:00 2001 From: nicolachr Date: Tue, 12 May 2026 15:24:41 +0300 Subject: [PATCH 07/18] move list filtering out of the card actions partial --- app/controllers/cards_controller.rb | 1 + app/views/cards/_actions.html.erb | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb index a851ecc6b5..0b07c22dfd 100644 --- a/app/controllers/cards_controller.rb +++ b/app/controllers/cards_controller.rb @@ -18,6 +18,7 @@ class CardsController < AuthenticatedController layout 'cards' def show + @other_lists = @board.ordered_lists.reject { |l| l.id == @list.id } render layout: !request.xhr? end diff --git a/app/views/cards/_actions.html.erb b/app/views/cards/_actions.html.erb index 6400a28c09..5621d08c65 100644 --- a/app/views/cards/_actions.html.erb +++ b/app/views/cards/_actions.html.erb @@ -1,10 +1,9 @@
- <% other_lists = @board.ordered_lists.reject { |l| l.id == @list.id } %> - <% if other_lists.any? %> + <% if @other_lists.any? %> <%= @list.name %>
- <% other_lists.each do |list| %> + <% @other_lists.each do |list| %> <%= link_to( move_to_list_project_board_list_card_path(current_project, @board, @list, @card, new_list_id: list.id), method: :post, From fa118649ed6184d9c07326dafebeef41d89478bb Mon Sep 17 00:00:00 2001 From: nicolachr Date: Thu, 4 Jun 2026 17:24:42 +0300 Subject: [PATCH 08/18] Show all lists in dropdown, disable card's current list --- .../stylesheets/hera/modules/_dropdown.scss | 6 ++++++ app/controllers/cards_controller.rb | 2 +- app/views/cards/_actions.html.erb | 20 +++++++++++-------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/hera/modules/_dropdown.scss b/app/assets/stylesheets/hera/modules/_dropdown.scss index c7e1d0e8f5..f2733ed86b 100644 --- a/app/assets/stylesheets/hera/modules/_dropdown.scss +++ b/app/assets/stylesheets/hera/modules/_dropdown.scss @@ -32,6 +32,12 @@ font-weight: 600; } + &.disabled { + color: var(--text-muted); + cursor: not-allowed; + pointer-events: none; + } + i { margin-right: 0.25rem; } diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb index 0b07c22dfd..5fd2fb0f13 100644 --- a/app/controllers/cards_controller.rb +++ b/app/controllers/cards_controller.rb @@ -18,7 +18,7 @@ class CardsController < AuthenticatedController layout 'cards' def show - @other_lists = @board.ordered_lists.reject { |l| l.id == @list.id } + @lists = @board.ordered_lists render layout: !request.xhr? end diff --git a/app/views/cards/_actions.html.erb b/app/views/cards/_actions.html.erb index 5621d08c65..f3e031a634 100644 --- a/app/views/cards/_actions.html.erb +++ b/app/views/cards/_actions.html.erb @@ -1,15 +1,19 @@
- <% if @other_lists.any? %> + <% if @lists.count > 1 %> <%= @list.name %>
- <% @other_lists.each do |list| %> - <%= link_to( - move_to_list_project_board_list_card_path(current_project, @board, @list, @card, new_list_id: list.id), - method: :post, - class: 'dropdown-item' - ) do %> - <%= list.name %> + <% @lists.each do |list| %> + <% if list.id == @list.id %> + <%= list.name %> + <% else %> + <%= link_to( + move_to_list_project_board_list_card_path(current_project, @board, @list, @card, new_list_id: list.id), + method: :post, + class: 'dropdown-item' + ) do %> + <%= list.name %> + <% end %> <% end %> <% end %>
From 8c59b714399972356fa3a69abcf983b302e73db2 Mon Sep 17 00:00:00 2001 From: nicolachr Date: Thu, 4 Jun 2026 17:24:48 +0300 Subject: [PATCH 09/18] Scope card show cache key to card's list --- app/views/cards/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index 0711a689ab..823d57b0fc 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -22,7 +22,7 @@
- <% cache ['card-information-tab', @card, @board.lists.maximum(:updated_at)] do %> + <% cache ['card-information-tab', @card, @card.list] do %>

<%= @card.name %> From b4264cbb97ba27d867fddd9df83183c80a3a2133 Mon Sep 17 00:00:00 2001 From: nicolachr Date: Thu, 4 Jun 2026 17:24:53 +0300 Subject: [PATCH 10/18] Track move_to_list as an update activity --- app/controllers/cards_controller.rb | 3 +-- app/models/activity.rb | 2 +- app/presenters/activity_presenter.rb | 2 -- spec/requests/cards/move_to_list_spec.rb | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb index 5fd2fb0f13..edbcf6ba7f 100644 --- a/app/controllers/cards_controller.rb +++ b/app/controllers/cards_controller.rb @@ -1,7 +1,6 @@ class CardsController < AuthenticatedController include ActivityTracking include ContentFromTemplate - include EventPublisher include Mentioned include NotificationsReader include ProjectScoped @@ -74,7 +73,7 @@ def move_to_list @card.save! end - publish_event('card.updated', @card.to_event_payload) + track_updated(@card) redirect_to [current_project, @board, target_list, @card], notice: 'Task moved.' end diff --git a/app/models/activity.rb b/app/models/activity.rb index e365f67601..25acbdc277 100644 --- a/app/models/activity.rb +++ b/app/models/activity.rb @@ -17,7 +17,7 @@ def project=(new_project); end validates_presence_of :action, :trackable_id, :trackable_type, :user - VALID_ACTIONS = %w[create destroy download move_to_list recover reopen resolve state_change update] + VALID_ACTIONS = %w[create destroy download recover reopen resolve state_change update] validates_inclusion_of :action, in: VALID_ACTIONS diff --git a/app/presenters/activity_presenter.rb b/app/presenters/activity_presenter.rb index 4981389acd..f406aef18f 100644 --- a/app/presenters/activity_presenter.rb +++ b/app/presenters/activity_presenter.rb @@ -83,8 +83,6 @@ def verb case activity.action when 'destroy' 'deleted' - when 'move_to_list' - 'moved' when 'state_change' 'updated' else diff --git a/spec/requests/cards/move_to_list_spec.rb b/spec/requests/cards/move_to_list_spec.rb index 08ed17b4bb..77d05cab4a 100644 --- a/spec/requests/cards/move_to_list_spec.rb +++ b/spec/requests/cards/move_to_list_spec.rb @@ -48,7 +48,7 @@ it 'creates an activity' do expect { submit }.to have_enqueued_job(ActivityTrackingJob).with( - action: 'move_to_list', + action: 'update', project_id: current_project.id, trackable_id: card_b.id, trackable_type: 'Card', From 12944aa7af1938662b38c1237d6dbf8b0143414b Mon Sep 17 00:00:00 2001 From: nicolachr Date: Thu, 18 Jun 2026 15:42:25 +0300 Subject: [PATCH 11/18] Extract card move actions into sub-resource controllers Cards::PositionController#create replaces #move (drag-and-drop JSON endpoint) and Cards::TransferController#create replaces #move_to_list (dropdown form POST), eliminating the naming ambiguity between the two actions in CardsController. ValidateMove is refactored to use moveable_items, moveable_item_name, and moveable_parent template methods instead of controller_name, so it works correctly from namespaced controllers. --- app/controllers/cards/position_controller.rb | 59 ++++++++++++++++++++ app/controllers/cards/transfer_controller.rb | 40 +++++++++++++ app/controllers/cards_controller.rb | 58 +------------------ app/controllers/concerns/validate_move.rb | 22 ++------ app/controllers/lists_controller.rb | 18 +++++- app/models/card.rb | 2 +- app/views/boards/_board.html.erb | 2 +- app/views/cards/_actions.html.erb | 2 +- config/routes.rb | 16 +++--- spec/requests/cards/move_to_list_spec.rb | 12 ++-- spec/requests/move_position_spec.rb | 2 +- 11 files changed, 138 insertions(+), 95 deletions(-) create mode 100644 app/controllers/cards/position_controller.rb create mode 100644 app/controllers/cards/transfer_controller.rb diff --git a/app/controllers/cards/position_controller.rb b/app/controllers/cards/position_controller.rb new file mode 100644 index 0000000000..5c4e4fbac1 --- /dev/null +++ b/app/controllers/cards/position_controller.rb @@ -0,0 +1,59 @@ +class Cards::PositionController < AuthenticatedController + include ActivityTracking + include ProjectScoped + include ValidateMove + + before_action :set_current_board_and_list + before_action :set_card + before_action :set_prev_item_and_next_item + before_action :validate_move_params + + def create + List.move(@card, prev_item: @prev_item, next_item: @next_item) + + if new_list + @card.list = new_list + @card.save + end + + track_updated(@card) + + render json: { + is_card: true, + id: @card.id, + link: polymorphic_path([current_project, @board, @card.reload.list, @card]), + moveLink: project_board_list_card_position_path(current_project, @board, @card.reload.list, @card) + } + end + + private + + def move_params + params.permit(:card_id, :project_id, :board_id, :list_id, :next_id, :prev_id, :new_list_id) + end + + def moveable_items + @board.cards + end + + def moveable_item_name + 'card' + end + + def moveable_parent + new_list || @list + end + + def new_list + @board.lists.find(move_params[:new_list_id]) if move_params[:new_list_id] + end + + def set_card + @card = @board.cards.find(params[:card_id]) + end + + def set_current_board_and_list + @board = current_project.boards.includes(:lists).find(params[:board_id]) + @list = @board.lists.includes(:cards).find(params[:list_id]) + end +end diff --git a/app/controllers/cards/transfer_controller.rb b/app/controllers/cards/transfer_controller.rb new file mode 100644 index 0000000000..2c39034f8d --- /dev/null +++ b/app/controllers/cards/transfer_controller.rb @@ -0,0 +1,40 @@ +class Cards::TransferController < AuthenticatedController + include ActivityTracking + include ProjectScoped + + before_action :set_current_board_and_list + before_action :set_card + + def create + target_list = @board.lists.find(params[:new_list_id]) + + if target_list.id == @card.list_id + redirect_to [current_project, @board, @list, @card], alert: 'Task is already in that list.' + return + end + + Card.transaction do + if (next_card = @card.next_card) + next_card.update_attribute(:previous_id, @card.previous_id) + end + + @card.list_id = target_list.id + @card.previous_id = target_list.last_card&.id + @card.save! + end + + track_updated(@card) + redirect_to [current_project, @board, target_list, @card], notice: 'Task moved.' + end + + private + + def set_card + @card = @board.cards.find(params[:card_id]) + end + + def set_current_board_and_list + @board = current_project.boards.includes(:lists).find(params[:board_id]) + @list = @board.lists.includes(:cards).find(params[:list_id]) + end +end diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb index edbcf6ba7f..6fd958098d 100644 --- a/app/controllers/cards_controller.rb +++ b/app/controllers/cards_controller.rb @@ -11,9 +11,6 @@ class CardsController < AuthenticatedController before_action :initialize_sidebar, only: [:show, :new, :edit] before_action :set_auto_save_key, only: [:new, :create, :edit, :update] - # Not at top because we need board and list set first - include ValidateMove - layout 'cards' def show @@ -53,48 +50,6 @@ def update end end - def move_to_list - target_list = @board.lists.find(params[:new_list_id]) - - if target_list.id == @card.list_id - redirect_to [current_project, @board, @list, @card], alert: 'Task is already in that list.' - return - end - - Card.transaction do - # Repair the source list chain before changing list_id, - # since next_card scopes to self.list - if (next_card = @card.next_card) - next_card.update_attribute(:previous_id, @card.previous_id) - end - - @card.list_id = target_list.id - @card.previous_id = target_list.last_card&.id - @card.save! - end - - track_updated(@card) - redirect_to [current_project, @board, target_list, @card], notice: 'Task moved.' - end - - def move - List.move(@card, prev_item: @prev_item, next_item: @next_item) - - if new_list - @card.list = new_list - @card.save - end - - track_updated(@card) - - render json: { - is_card: true, - id: @card.id, - link: polymorphic_path([current_project, @board, @card.reload.list, @card]), - moveLink: move_project_board_list_card_path(current_project, @board, @card.reload.list, @card) - } - end - def destroy if @card.destroy track_destroyed(@card) @@ -110,13 +65,6 @@ def card_params params.require(:card).permit(:name, :description, :due_date, assignee_ids: []) end - def move_params - params. - permit(:id, :project_id, :board_id, :list_id, - :next_id, :prev_id, :new_list_id - ) - end - def initialize_sidebar @sorted_cards = @list.ordered_cards.select(&:persisted?) end @@ -132,7 +80,7 @@ def set_or_initialize_card def set_current_board_and_list @board = current_project.boards.includes(:lists).find(params[:board_id]) - @list = @board.lists.includes(:cards).find(params[:list_id]) + @list = @board.lists.includes(:cards).find(params[:list_id]) end def set_auto_save_key @@ -144,8 +92,4 @@ def set_auto_save_key "#{@list.id}-card" end end - - def new_list - @board.lists.find(move_params[:new_list_id]) if move_params[:new_list_id] - end end diff --git a/app/controllers/concerns/validate_move.rb b/app/controllers/concerns/validate_move.rb index 5e956107f6..6cd7970bc3 100644 --- a/app/controllers/concerns/validate_move.rb +++ b/app/controllers/concerns/validate_move.rb @@ -1,15 +1,11 @@ module ValidateMove extend ActiveSupport::Concern - included do - before_action :set_prev_item_and_next_item, only: :move - before_action :validate_move_params, only: :move - end protected def set_prev_item_and_next_item - @prev_item = @board.send(controller_name).find_by(id: move_params[:prev_id]) - @next_item = @board.send(controller_name).find_by(id: move_params[:next_id]) + @prev_item = moveable_items.find_by(id: move_params[:prev_id]) + @next_item = moveable_items.find_by(id: move_params[:next_id]) end def validate_move_params @@ -18,27 +14,21 @@ def validate_move_params end end - def parent - if controller_name == 'cards' - new_list || @list - elsif controller_name == 'lists' - @board - end - end + private def valid_move_params? if @prev_item.present? - next_item_of_prev_item = @prev_item.send("next_#{controller_name.classify.downcase}") + next_item_of_prev_item = @prev_item.send("next_#{moveable_item_name}") if next_item_of_prev_item @next_item == next_item_of_prev_item else @next_item.nil? end else - if parent.items.empty? + if moveable_parent.items.empty? @next_item.nil? else - @next_item == parent.first_item + @next_item == moveable_parent.first_item end end end diff --git a/app/controllers/lists_controller.rb b/app/controllers/lists_controller.rb index 4f880e1ef5..1b8742ed8b 100644 --- a/app/controllers/lists_controller.rb +++ b/app/controllers/lists_controller.rb @@ -1,12 +1,12 @@ class ListsController < AuthenticatedController include ActivityTracking include ProjectScoped + include ValidateMove before_action :set_current_board before_action :set_list, only: [:edit, :update, :destroy, :move] - - # Not at top because we need board set first - include ValidateMove + before_action :set_prev_item_and_next_item, only: :move + before_action :validate_move_params, only: :move def new @list = @board.lists.new @@ -63,6 +63,18 @@ def move_params permit(:id, :project_id, :board_id, :next_id, :prev_id) end + def moveable_items + @board.lists + end + + def moveable_item_name + 'list' + end + + def moveable_parent + @board + end + def set_current_board @board = current_project.boards.find(params[:board_id]) end diff --git a/app/models/card.rb b/app/models/card.rb index b162935817..1afe15c458 100644 --- a/app/models/card.rb +++ b/app/models/card.rb @@ -97,7 +97,7 @@ def local_event_payload def local_fields { - 'List' => list.name.parameterize(preserve_case: true, separator: '_'), + 'List' => list.name.parameterize(preserve_case: true, separator: '_'), 'Title' => name } end diff --git a/app/views/boards/_board.html.erb b/app/views/boards/_board.html.erb index e37800ea83..842095b27d 100644 --- a/app/views/boards/_board.html.erb +++ b/app/views/boards/_board.html.erb @@ -35,7 +35,7 @@
    <% list.ordered_cards.each do |card| %> <% cache ['board-list-card', card] do %> -
  • +
  • <%= link_to project_board_list_card_path(current_project, board, list, card) do %>
    <%= card.name %>
    diff --git a/app/views/cards/_actions.html.erb b/app/views/cards/_actions.html.erb index f3e031a634..2655ec56a6 100644 --- a/app/views/cards/_actions.html.erb +++ b/app/views/cards/_actions.html.erb @@ -8,7 +8,7 @@ <%= list.name %> <% else %> <%= link_to( - move_to_list_project_board_list_card_path(current_project, @board, @list, @card, new_list_id: list.id), + project_board_list_card_transfer_path(current_project, @board, @list, @card, new_list_id: list.id), method: :post, class: 'dropdown-item' ) do %> diff --git a/config/routes.rb b/config/routes.rb index a884f1afec..d110ac01b1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,7 +12,7 @@ # ------------------------------------------------------------ Authentication # Sign in / sign out - get '/login' => 'sessions#new' + get '/login' => 'sessions#new' get '/logout' => 'sessions#destroy' resource :session @@ -58,10 +58,8 @@ resources :lists, except: [:index] do member { post :move } resources :cards, except: [:index] do - member do - post :move - post :move_to_list - end + resource :position, only: [:create], controller: 'cards/position' + resource :transfer, only: [:create], controller: 'cards/transfer' resources :revisions, only: [:index, :show] end end @@ -135,12 +133,12 @@ get 'trash' => 'revisions#trash' # ------------------------------------------------------- Export Manager - get '/export' => 'export#index', as: :export_manager + get '/export' => 'export#index', as: :export_manager # ------------------------------------------------------- Upload Manager - get '/upload' => 'upload#index', as: :upload_manager - post '/upload' => 'upload#create' - post '/upload/parse' => 'upload#parse' + get '/upload' => 'upload#index', as: :upload_manager + post '/upload' => 'upload#create' + post '/upload/parse' => 'upload#parse' end resources :console, only: [] do diff --git a/spec/requests/cards/move_to_list_spec.rb b/spec/requests/cards/move_to_list_spec.rb index 77d05cab4a..26692ce274 100644 --- a/spec/requests/cards/move_to_list_spec.rb +++ b/spec/requests/cards/move_to_list_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' -describe 'cards#move_to_list' do +describe 'Cards::TransferController#create' do before { login_to_project_as_user } - let(:board) { create(:board, node: current_project.methodology_library, project: current_project) } + let(:board) { create(:board, node: current_project.methodology_library, project: current_project) } let(:source_list) { create(:list, board: board) } let(:target_list) { create(:list, board: board, previous_id: source_list.id) } @@ -14,7 +14,7 @@ let(:last_card_in_target) { create(:card, list: target_list) } let(:submit) do - post move_to_list_project_board_list_card_path(current_project, board, source_list, card_b), + post project_board_list_card_transfer_path(current_project, board, source_list, card_b), params: { new_list_id: target_list.id } end @@ -58,7 +58,7 @@ context 'when moving the first card in the source list' do let(:submit) do - post move_to_list_project_board_list_card_path(current_project, board, source_list, card_a), + post project_board_list_card_transfer_path(current_project, board, source_list, card_a), params: { new_list_id: target_list.id } end @@ -70,7 +70,7 @@ context 'when moving the last card in the source list' do let(:submit) do - post move_to_list_project_board_list_card_path(current_project, board, source_list, card_c), + post project_board_list_card_transfer_path(current_project, board, source_list, card_c), params: { new_list_id: target_list.id } end @@ -82,7 +82,7 @@ context 'when the target list is the same as the source list' do let(:submit) do - post move_to_list_project_board_list_card_path(current_project, board, source_list, card_c), + post project_board_list_card_transfer_path(current_project, board, source_list, card_c), params: { new_list_id: source_list.id } end diff --git a/spec/requests/move_position_spec.rb b/spec/requests/move_position_spec.rb index b251f66000..0e67d12a8e 100644 --- a/spec/requests/move_position_spec.rb +++ b/spec/requests/move_position_spec.rb @@ -66,7 +66,7 @@ let(:invalid_prev_id) { another_card.id } let(:invalid_next_id) { another_card.id } subject do - post move_project_board_list_card_path(current_project, board, list_1, card_1), params: params + post project_board_list_card_position_path(current_project, board, list_1, card_1), params: params end include_examples 'validates move params' From ef8960f9efe79eae952011255df01351bdcc09d9 Mon Sep 17 00:00:00 2001 From: nicolachr Date: Thu, 18 Jun 2026 15:57:16 +0300 Subject: [PATCH 12/18] Fix cache invalidation and atomic save in card position/transfer Add @board to the card show cache key so the transfer dropdown busts when any list on the board is added, renamed, or deleted. Wrap List.move and the list assignment save in a single transaction in Cards::PositionController so a save failure rolls back the linked-list position change atomically. --- app/controllers/cards/position_controller.rb | 10 ++++++---- app/views/cards/show.html.erb | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/cards/position_controller.rb b/app/controllers/cards/position_controller.rb index 5c4e4fbac1..fdf4b8080f 100644 --- a/app/controllers/cards/position_controller.rb +++ b/app/controllers/cards/position_controller.rb @@ -9,11 +9,13 @@ class Cards::PositionController < AuthenticatedController before_action :validate_move_params def create - List.move(@card, prev_item: @prev_item, next_item: @next_item) + Card.transaction do + List.move(@card, prev_item: @prev_item, next_item: @next_item) - if new_list - @card.list = new_list - @card.save + if new_list + @card.list = new_list + @card.save! + end end track_updated(@card) diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index 823d57b0fc..ee3eb1c3d2 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -22,7 +22,7 @@
    - <% cache ['card-information-tab', @card, @card.list] do %> + <% cache ['card-information-tab', @card, @card.list, @board] do %>

    <%= @card.name %> From 17cc2121011810b6ff20b59a9574e06d5cfb5a78 Mon Sep 17 00:00:00 2001 From: nicolachr Date: Fri, 19 Jun 2026 15:11:42 +0300 Subject: [PATCH 13/18] Remove unused Eventable from Card model Activity tracking for cards already works via ActivityTracking; the Eventable concern and local_event_payload were dead code. --- app/models/card.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/models/card.rb b/app/models/card.rb index 1afe15c458..d24658db9f 100644 --- a/app/models/card.rb +++ b/app/models/card.rb @@ -1,6 +1,5 @@ class Card < ApplicationRecord include Commentable - include Eventable include HasFields include RevisionTracking include Subscribable @@ -85,16 +84,6 @@ def to_xml(xml_builder, includes: [], version: 3) end end - def local_event_payload - { - project: { - id: project.id, - name: project.name - }, - title: name - } - end - def local_fields { 'List' => list.name.parameterize(preserve_case: true, separator: '_'), From 458f24e1ffd18ef13e56014c5e54aac873403c35 Mon Sep 17 00:00:00 2001 From: Aaron Date: Wed, 15 Jul 2026 19:02:39 +0800 Subject: [PATCH 14/18] Remove transfer controller --- app/controllers/cards/position_controller.rb | 59 ++++++++++++++++---- app/controllers/cards/transfer_controller.rb | 40 ------------- app/views/cards/_actions.html.erb | 2 +- config/routes.rb | 1 - spec/requests/cards/move_to_list_spec.rb | 10 ++-- 5 files changed, 54 insertions(+), 58 deletions(-) delete mode 100644 app/controllers/cards/transfer_controller.rb diff --git a/app/controllers/cards/position_controller.rb b/app/controllers/cards/position_controller.rb index fdf4b8080f..60bcdc1889 100644 --- a/app/controllers/cards/position_controller.rb +++ b/app/controllers/cards/position_controller.rb @@ -5,6 +5,7 @@ class Cards::PositionController < AuthenticatedController before_action :set_current_board_and_list before_action :set_card + before_action :require_list_change, if: :append_to_list? before_action :set_prev_item_and_next_item before_action :validate_move_params @@ -19,35 +20,62 @@ def create end track_updated(@card) + @card.reload - render json: { - is_card: true, - id: @card.id, - link: polymorphic_path([current_project, @board, @card.reload.list, @card]), - moveLink: project_board_list_card_position_path(current_project, @board, @card.reload.list, @card) - } + respond_to do |format| + format.html do + redirect_to project_board_list_card_path(current_project, @board, @card.list, @card), + notice: 'Task moved.' + end + + format.json do + render json: { + is_card: true, + id: @card.id, + link: polymorphic_path([current_project, @board, @card.list, @card]), + moveLink: project_board_list_card_position_path(current_project, @board, @card.list, @card) + } + end + end end private - def move_params - params.permit(:card_id, :project_id, :board_id, :list_id, :next_id, :prev_id, :new_list_id) + # A request with a new_list_id but no explicit position appends the card to + # the end of the target list (e.g. the 'move to list' dropdown). + def append_to_list? + move_params[:new_list_id].present? && + move_params[:prev_id].blank? && + move_params[:next_id].blank? end - def moveable_items - @board.cards + def move_params + params.permit(:card_id, :project_id, :board_id, :list_id, :next_id, :prev_id, :new_list_id) end def moveable_item_name 'card' end + def moveable_items + @board.cards + end + def moveable_parent new_list || @list end def new_list - @board.lists.find(move_params[:new_list_id]) if move_params[:new_list_id] + return if move_params[:new_list_id].blank? + + @new_list ||= @board.lists.find(move_params[:new_list_id]) + end + + def require_list_change + return if new_list.id != @card.list_id + + redirect_to project_board_list_card_path(current_project, @board, @list, @card), + alert: 'Task is already in that list.' end def set_card @@ -58,4 +86,13 @@ def set_current_board_and_list @board = current_project.boards.includes(:lists).find(params[:board_id]) @list = @board.lists.includes(:cards).find(params[:list_id]) end + + def set_prev_item_and_next_item + if append_to_list? + @prev_item = new_list.last_card + @next_item = nil + else + super + end + end end diff --git a/app/controllers/cards/transfer_controller.rb b/app/controllers/cards/transfer_controller.rb deleted file mode 100644 index 2c39034f8d..0000000000 --- a/app/controllers/cards/transfer_controller.rb +++ /dev/null @@ -1,40 +0,0 @@ -class Cards::TransferController < AuthenticatedController - include ActivityTracking - include ProjectScoped - - before_action :set_current_board_and_list - before_action :set_card - - def create - target_list = @board.lists.find(params[:new_list_id]) - - if target_list.id == @card.list_id - redirect_to [current_project, @board, @list, @card], alert: 'Task is already in that list.' - return - end - - Card.transaction do - if (next_card = @card.next_card) - next_card.update_attribute(:previous_id, @card.previous_id) - end - - @card.list_id = target_list.id - @card.previous_id = target_list.last_card&.id - @card.save! - end - - track_updated(@card) - redirect_to [current_project, @board, target_list, @card], notice: 'Task moved.' - end - - private - - def set_card - @card = @board.cards.find(params[:card_id]) - end - - def set_current_board_and_list - @board = current_project.boards.includes(:lists).find(params[:board_id]) - @list = @board.lists.includes(:cards).find(params[:list_id]) - end -end diff --git a/app/views/cards/_actions.html.erb b/app/views/cards/_actions.html.erb index 2655ec56a6..2d530a4df0 100644 --- a/app/views/cards/_actions.html.erb +++ b/app/views/cards/_actions.html.erb @@ -8,7 +8,7 @@ <%= list.name %> <% else %> <%= link_to( - project_board_list_card_transfer_path(current_project, @board, @list, @card, new_list_id: list.id), + project_board_list_card_position_path(current_project, @board, @list, @card, new_list_id: list.id), method: :post, class: 'dropdown-item' ) do %> diff --git a/config/routes.rb b/config/routes.rb index d110ac01b1..8fd79c976e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -59,7 +59,6 @@ member { post :move } resources :cards, except: [:index] do resource :position, only: [:create], controller: 'cards/position' - resource :transfer, only: [:create], controller: 'cards/transfer' resources :revisions, only: [:index, :show] end end diff --git a/spec/requests/cards/move_to_list_spec.rb b/spec/requests/cards/move_to_list_spec.rb index 26692ce274..93e91a40e7 100644 --- a/spec/requests/cards/move_to_list_spec.rb +++ b/spec/requests/cards/move_to_list_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -describe 'Cards::TransferController#create' do +describe 'Cards::PositionController#create (move to list)' do before { login_to_project_as_user } let(:board) { create(:board, node: current_project.methodology_library, project: current_project) } @@ -14,7 +14,7 @@ let(:last_card_in_target) { create(:card, list: target_list) } let(:submit) do - post project_board_list_card_transfer_path(current_project, board, source_list, card_b), + post project_board_list_card_position_path(current_project, board, source_list, card_b), params: { new_list_id: target_list.id } end @@ -58,7 +58,7 @@ context 'when moving the first card in the source list' do let(:submit) do - post project_board_list_card_transfer_path(current_project, board, source_list, card_a), + post project_board_list_card_position_path(current_project, board, source_list, card_a), params: { new_list_id: target_list.id } end @@ -70,7 +70,7 @@ context 'when moving the last card in the source list' do let(:submit) do - post project_board_list_card_transfer_path(current_project, board, source_list, card_c), + post project_board_list_card_position_path(current_project, board, source_list, card_c), params: { new_list_id: target_list.id } end @@ -82,7 +82,7 @@ context 'when the target list is the same as the source list' do let(:submit) do - post project_board_list_card_transfer_path(current_project, board, source_list, card_c), + post project_board_list_card_position_path(current_project, board, source_list, card_c), params: { new_list_id: source_list.id } end From 651c2c993a5e4545422497d768289ec222fcf645 Mon Sep 17 00:00:00 2001 From: Aaron Date: Wed, 15 Jul 2026 19:08:18 +0800 Subject: [PATCH 15/18] Update the positions controller to use EventPublisher --- app/controllers/cards/position_controller.rb | 13 +++++++++++-- app/models/card.rb | 11 +++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/controllers/cards/position_controller.rb b/app/controllers/cards/position_controller.rb index 60bcdc1889..f5f95f34c7 100644 --- a/app/controllers/cards/position_controller.rb +++ b/app/controllers/cards/position_controller.rb @@ -1,5 +1,5 @@ class Cards::PositionController < AuthenticatedController - include ActivityTracking + include EventPublisher include ProjectScoped include ValidateMove @@ -19,7 +19,7 @@ def create end end - track_updated(@card) + publish_event('card.updated', @card.to_event_payload) @card.reload respond_to do |format| @@ -49,6 +49,15 @@ def append_to_list? move_params[:next_id].blank? end + # Override EventPublisher#event_action_payload: the RESTful action is + # 'create', but moving a card is semantically an update. + # + # FIXME: Replace with ActivityService action registration once + # convention-over-configuration approach is implemented. + def event_action_payload + super.merge(action: 'update') + end + def move_params params.permit(:card_id, :project_id, :board_id, :list_id, :next_id, :prev_id, :new_list_id) end diff --git a/app/models/card.rb b/app/models/card.rb index d24658db9f..426cb9630e 100644 --- a/app/models/card.rb +++ b/app/models/card.rb @@ -1,5 +1,6 @@ class Card < ApplicationRecord include Commentable + include Eventable include HasFields include RevisionTracking include Subscribable @@ -84,6 +85,16 @@ def to_xml(xml_builder, includes: [], version: 3) end end + def local_event_payload + { + name: name, + project: { + id: project.id, + name: project.name + } + } + end + def local_fields { 'List' => list.name.parameterize(preserve_case: true, separator: '_'), From 42135fda6e4e24c599a32be2ee04ddeb255dd5b2 Mon Sep 17 00:00:00 2001 From: Aaron Date: Mon, 3 Aug 2026 17:33:22 +0800 Subject: [PATCH 16/18] Add PositionsController for Lists and rename concern --- app/controllers/cards/position_controller.rb | 2 +- ..._move.rb => linked_list_move_validator.rb} | 2 +- app/controllers/lists/position_controller.rb | 44 +++++++++++++++++++ app/controllers/lists_controller.rb | 30 +------------ app/views/boards/_board.html.erb | 2 +- app/views/cards/show.html.erb | 2 +- config/routes.rb | 2 +- spec/requests/move_position_spec.rb | 2 +- 8 files changed, 51 insertions(+), 35 deletions(-) rename app/controllers/concerns/{validate_move.rb => linked_list_move_validator.rb} (96%) create mode 100644 app/controllers/lists/position_controller.rb diff --git a/app/controllers/cards/position_controller.rb b/app/controllers/cards/position_controller.rb index f5f95f34c7..a262fa6366 100644 --- a/app/controllers/cards/position_controller.rb +++ b/app/controllers/cards/position_controller.rb @@ -1,7 +1,7 @@ class Cards::PositionController < AuthenticatedController include EventPublisher + include LinkedListMoveValidator include ProjectScoped - include ValidateMove before_action :set_current_board_and_list before_action :set_card diff --git a/app/controllers/concerns/validate_move.rb b/app/controllers/concerns/linked_list_move_validator.rb similarity index 96% rename from app/controllers/concerns/validate_move.rb rename to app/controllers/concerns/linked_list_move_validator.rb index 6cd7970bc3..317a96f3fc 100644 --- a/app/controllers/concerns/validate_move.rb +++ b/app/controllers/concerns/linked_list_move_validator.rb @@ -1,4 +1,4 @@ -module ValidateMove +module LinkedListMoveValidator extend ActiveSupport::Concern protected diff --git a/app/controllers/lists/position_controller.rb b/app/controllers/lists/position_controller.rb new file mode 100644 index 0000000000..c53acd3721 --- /dev/null +++ b/app/controllers/lists/position_controller.rb @@ -0,0 +1,44 @@ +class Lists::PositionController < AuthenticatedController + include ActivityTracking + include LinkedListMoveValidator + include ProjectScoped + + before_action :set_current_board + before_action :set_list + before_action :set_prev_item_and_next_item + before_action :validate_move_params + + def create + Board.move(@list, prev_item: @prev_item, next_item: @next_item) + + track_updated(@list) + + render json: @list + end + + private + + def move_params + params.permit(:list_id, :project_id, :board_id, :next_id, :prev_id) + end + + def moveable_item_name + 'list' + end + + def moveable_items + @board.lists + end + + def moveable_parent + @board + end + + def set_current_board + @board = current_project.boards.find(params[:board_id]) + end + + def set_list + @list = @board.lists.find(params[:list_id]) + end +end diff --git a/app/controllers/lists_controller.rb b/app/controllers/lists_controller.rb index 1b8742ed8b..541cd8e41f 100644 --- a/app/controllers/lists_controller.rb +++ b/app/controllers/lists_controller.rb @@ -1,12 +1,9 @@ class ListsController < AuthenticatedController include ActivityTracking include ProjectScoped - include ValidateMove before_action :set_current_board - before_action :set_list, only: [:edit, :update, :destroy, :move] - before_action :set_prev_item_and_next_item, only: :move - before_action :validate_move_params, only: :move + before_action :set_list, only: [:edit, :update, :destroy] def new @list = @board.lists.new @@ -35,14 +32,6 @@ def update end end - def move - Board.move(@list, prev_item: @prev_item, next_item: @next_item) - - track_updated(@list) - - render json: @list - end - def destroy if @list.destroy track_destroyed(@list) @@ -58,23 +47,6 @@ def list_params params.require(:list).permit(:name) end - def move_params - params. - permit(:id, :project_id, :board_id, :next_id, :prev_id) - end - - def moveable_items - @board.lists - end - - def moveable_item_name - 'list' - end - - def moveable_parent - @board - end - def set_current_board @board = current_project.boards.find(params[:board_id]) end diff --git a/app/views/boards/_board.html.erb b/app/views/boards/_board.html.erb index 842095b27d..8635a9a2e4 100644 --- a/app/views/boards/_board.html.erb +++ b/app/views/boards/_board.html.erb @@ -4,7 +4,7 @@ <% board.ordered_lists.each do |list| %> <% cache ['board-list', list] do %> -
  • +

  • <%= list.name %> diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index ee3eb1c3d2..32eba2e7cf 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -22,7 +22,7 @@
    - <% cache ['card-information-tab', @card, @card.list, @board] do %> + <% cache ['card-information-tab', @card, @board] do %>

    <%= @card.name %> diff --git a/config/routes.rb b/config/routes.rb index 8fd79c976e..97fe83fd7e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -56,7 +56,7 @@ resources :boards do resources :lists, except: [:index] do - member { post :move } + resource :position, only: [:create], controller: 'lists/position' resources :cards, except: [:index] do resource :position, only: [:create], controller: 'cards/position' resources :revisions, only: [:index, :show] diff --git a/spec/requests/move_position_spec.rb b/spec/requests/move_position_spec.rb index 0e67d12a8e..3da1294b01 100644 --- a/spec/requests/move_position_spec.rb +++ b/spec/requests/move_position_spec.rb @@ -52,7 +52,7 @@ let(:invalid_prev_id) { another_list.id } let(:invalid_next_id) { another_list.id } subject do - post move_project_board_list_path(current_project, board, list_2), params: params + post project_board_list_position_path(current_project, board, list_2), params: params end include_examples 'validates move params' From f782d5bf9cbdff856abda4a216b172d63bf0042a Mon Sep 17 00:00:00 2001 From: Aaron Date: Mon, 3 Aug 2026 17:52:35 +0800 Subject: [PATCH 17/18] Simplify cache key and use link_to_if --- app/views/cards/_actions.html.erb | 16 +++++++--------- app/views/cards/show.html.erb | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/views/cards/_actions.html.erb b/app/views/cards/_actions.html.erb index 2d530a4df0..acdfd1a598 100644 --- a/app/views/cards/_actions.html.erb +++ b/app/views/cards/_actions.html.erb @@ -4,16 +4,14 @@ <%= @list.name %>
    <% @lists.each do |list| %> - <% if list.id == @list.id %> + <%= link_to_if( + list.id != @list.id, + list.name, + project_board_list_card_position_path(current_project, @board, @list, @card, new_list_id: list.id), + method: :post, + class: 'dropdown-item' + ) do %> <%= list.name %> - <% else %> - <%= link_to( - project_board_list_card_position_path(current_project, @board, @list, @card, new_list_id: list.id), - method: :post, - class: 'dropdown-item' - ) do %> - <%= list.name %> - <% end %> <% end %> <% end %>
    diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index 32eba2e7cf..362db0a04c 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -22,7 +22,7 @@
    - <% cache ['card-information-tab', @card, @board] do %> + <% cache ['card-information-tab', @card] do %>

    <%= @card.name %> From 73e3e3394252019644e6b2f07148b8020b199080 Mon Sep 17 00:00:00 2001 From: Aaron Date: Tue, 4 Aug 2026 15:50:02 +0800 Subject: [PATCH 18/18] Add back payload data and use :update for positions controller --- .../javascripts/hera/pages/boards/show.js.coffee | 2 +- app/controllers/cards/position_controller.rb | 11 +---------- app/controllers/lists/position_controller.rb | 2 +- app/models/card.rb | 8 ++++++++ app/views/cards/_actions.html.erb | 2 +- config/routes.rb | 4 ++-- spec/requests/cards/move_to_list_spec.rb | 10 +++++----- spec/requests/move_position_spec.rb | 4 ++-- 8 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/hera/pages/boards/show.js.coffee b/app/assets/javascripts/hera/pages/boards/show.js.coffee index 51f3162af4..6ae87199d6 100644 --- a/app/assets/javascripts/hera/pages/boards/show.js.coffee +++ b/app/assets/javascripts/hera/pages/boards/show.js.coffee @@ -21,7 +21,7 @@ class SortableBoards url: url data: params dataType: 'json' - type: 'post' + type: 'patch' success: (data, status, xhr) -> if data.is_card $cardLink = $(".card[data-card-id='#{data.id}'] a") diff --git a/app/controllers/cards/position_controller.rb b/app/controllers/cards/position_controller.rb index a262fa6366..0d24100cc1 100644 --- a/app/controllers/cards/position_controller.rb +++ b/app/controllers/cards/position_controller.rb @@ -9,7 +9,7 @@ class Cards::PositionController < AuthenticatedController before_action :set_prev_item_and_next_item before_action :validate_move_params - def create + def update Card.transaction do List.move(@card, prev_item: @prev_item, next_item: @next_item) @@ -49,15 +49,6 @@ def append_to_list? move_params[:next_id].blank? end - # Override EventPublisher#event_action_payload: the RESTful action is - # 'create', but moving a card is semantically an update. - # - # FIXME: Replace with ActivityService action registration once - # convention-over-configuration approach is implemented. - def event_action_payload - super.merge(action: 'update') - end - def move_params params.permit(:card_id, :project_id, :board_id, :list_id, :next_id, :prev_id, :new_list_id) end diff --git a/app/controllers/lists/position_controller.rb b/app/controllers/lists/position_controller.rb index c53acd3721..b557a91ebc 100644 --- a/app/controllers/lists/position_controller.rb +++ b/app/controllers/lists/position_controller.rb @@ -8,7 +8,7 @@ class Lists::PositionController < AuthenticatedController before_action :set_prev_item_and_next_item before_action :validate_move_params - def create + def update Board.move(@list, prev_item: @prev_item, next_item: @next_item) track_updated(@list) diff --git a/app/models/card.rb b/app/models/card.rb index 426cb9630e..4ba76baade 100644 --- a/app/models/card.rb +++ b/app/models/card.rb @@ -87,6 +87,14 @@ def to_xml(xml_builder, includes: [], version: 3) def local_event_payload { + board: { + id: board.id, + name: board.name + }, + list: { + id: list.id, + name: list.name + }, name: name, project: { id: project.id, diff --git a/app/views/cards/_actions.html.erb b/app/views/cards/_actions.html.erb index acdfd1a598..df95d7a9c3 100644 --- a/app/views/cards/_actions.html.erb +++ b/app/views/cards/_actions.html.erb @@ -8,7 +8,7 @@ list.id != @list.id, list.name, project_board_list_card_position_path(current_project, @board, @list, @card, new_list_id: list.id), - method: :post, + method: :patch, class: 'dropdown-item' ) do %> <%= list.name %> diff --git a/config/routes.rb b/config/routes.rb index 97fe83fd7e..f0497d4a33 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -56,9 +56,9 @@ resources :boards do resources :lists, except: [:index] do - resource :position, only: [:create], controller: 'lists/position' + resource :position, only: [:update], controller: 'lists/position' resources :cards, except: [:index] do - resource :position, only: [:create], controller: 'cards/position' + resource :position, only: [:update], controller: 'cards/position' resources :revisions, only: [:index, :show] end end diff --git a/spec/requests/cards/move_to_list_spec.rb b/spec/requests/cards/move_to_list_spec.rb index 93e91a40e7..c897b1d13b 100644 --- a/spec/requests/cards/move_to_list_spec.rb +++ b/spec/requests/cards/move_to_list_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -describe 'Cards::PositionController#create (move to list)' do +describe 'Cards::PositionController#update (move to list)' do before { login_to_project_as_user } let(:board) { create(:board, node: current_project.methodology_library, project: current_project) } @@ -14,7 +14,7 @@ let(:last_card_in_target) { create(:card, list: target_list) } let(:submit) do - post project_board_list_card_position_path(current_project, board, source_list, card_b), + patch project_board_list_card_position_path(current_project, board, source_list, card_b), params: { new_list_id: target_list.id } end @@ -58,7 +58,7 @@ context 'when moving the first card in the source list' do let(:submit) do - post project_board_list_card_position_path(current_project, board, source_list, card_a), + patch project_board_list_card_position_path(current_project, board, source_list, card_a), params: { new_list_id: target_list.id } end @@ -70,7 +70,7 @@ context 'when moving the last card in the source list' do let(:submit) do - post project_board_list_card_position_path(current_project, board, source_list, card_c), + patch project_board_list_card_position_path(current_project, board, source_list, card_c), params: { new_list_id: target_list.id } end @@ -82,7 +82,7 @@ context 'when the target list is the same as the source list' do let(:submit) do - post project_board_list_card_position_path(current_project, board, source_list, card_c), + patch project_board_list_card_position_path(current_project, board, source_list, card_c), params: { new_list_id: source_list.id } end diff --git a/spec/requests/move_position_spec.rb b/spec/requests/move_position_spec.rb index 3da1294b01..ea2c031d14 100644 --- a/spec/requests/move_position_spec.rb +++ b/spec/requests/move_position_spec.rb @@ -52,7 +52,7 @@ let(:invalid_prev_id) { another_list.id } let(:invalid_next_id) { another_list.id } subject do - post project_board_list_position_path(current_project, board, list_2), params: params + patch project_board_list_position_path(current_project, board, list_2), params: params end include_examples 'validates move params' @@ -66,7 +66,7 @@ let(:invalid_prev_id) { another_card.id } let(:invalid_next_id) { another_card.id } subject do - post project_board_list_card_position_path(current_project, board, list_1, card_1), params: params + patch project_board_list_card_position_path(current_project, board, list_1, card_1), params: params end include_examples 'validates move params'