From 85dc423f7090da0a52c73eb66faf22ddb20efff9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 19 Sep 2020 01:45:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee --- app/services/boards/destroy_service.rb | 8 ++++++-- app/services/boards/issues/move_service.rb | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'app/services/boards') diff --git a/app/services/boards/destroy_service.rb b/app/services/boards/destroy_service.rb index ea0c1394aa3..8f3d4b58b7b 100644 --- a/app/services/boards/destroy_service.rb +++ b/app/services/boards/destroy_service.rb @@ -3,9 +3,13 @@ module Boards class DestroyService < Boards::BaseService def execute(board) - return false if parent.boards.size == 1 + if parent.boards.size == 1 + return ServiceResponse.error(message: "The board could not be deleted, because the parent doesn't have any other boards.") + end - board.destroy + board.destroy! + + ServiceResponse.success end end end diff --git a/app/services/boards/issues/move_service.rb b/app/services/boards/issues/move_service.rb index 14e8683ebdf..56a7e228b10 100644 --- a/app/services/boards/issues/move_service.rb +++ b/app/services/boards/issues/move_service.rb @@ -71,12 +71,16 @@ module Boards # rubocop: disable CodeReuse/ActiveRecord def moving_from_list + return unless params[:from_list_id].present? + @moving_from_list ||= board.lists.find_by(id: params[:from_list_id]) end # rubocop: enable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord def moving_to_list + return unless params[:to_list_id].present? + @moving_to_list ||= board.lists.find_by(id: params[:to_list_id]) end # rubocop: enable CodeReuse/ActiveRecord -- cgit v1.2.3