Commit 82ea7195 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'dm-fix-assign-unassign-quick-actions' into 'master'

Don't ignore first action when assign and unassign quick actions are used in the same comment

See merge request gitlab-org/gitlab-ce!21749
parents 85f66f37 8811692c
...@@ -126,18 +126,16 @@ module QuickActions ...@@ -126,18 +126,16 @@ module QuickActions
parse_params do |assignee_param| parse_params do |assignee_param|
extract_users(assignee_param) extract_users(assignee_param)
end end
# rubocop: disable CodeReuse/ActiveRecord
command :assign do |users| command :assign do |users|
next if users.empty? next if users.empty?
@updates[:assignee_ids] = if issuable.allows_multiple_assignees?
if issuable.allows_multiple_assignees? @updates[:assignee_ids] ||= issuable.assignees.map(&:id)
issuable.assignees.pluck(:id) + users.map(&:id) @updates[:assignee_ids] += users.map(&:id)
else else
[users.first.id] @updates[:assignee_ids] = [users.first.id]
end end
end end
# rubocop: enable CodeReuse/ActiveRecord
desc do desc do
if issuable.allows_multiple_assignees? if issuable.allows_multiple_assignees?
...@@ -164,16 +162,14 @@ module QuickActions ...@@ -164,16 +162,14 @@ module QuickActions
# When multiple users are assigned, all will be unassigned if multiple assignees are no longer allowed # When multiple users are assigned, all will be unassigned if multiple assignees are no longer allowed
extract_users(unassign_param) if issuable.allows_multiple_assignees? extract_users(unassign_param) if issuable.allows_multiple_assignees?
end end
# rubocop: disable CodeReuse/ActiveRecord
command :unassign do |users = nil| command :unassign do |users = nil|
@updates[:assignee_ids] = if issuable.allows_multiple_assignees? && users&.any?
if users&.any? @updates[:assignee_ids] ||= issuable.assignees.map(&:id)
issuable.assignees.pluck(:id) - users.map(&:id) @updates[:assignee_ids] -= users.map(&:id)
else else
[] @updates[:assignee_ids] = []
end end
end end
# rubocop: enable CodeReuse/ActiveRecord
desc 'Set milestone' desc 'Set milestone'
explanation do |milestone| explanation do |milestone|
......
---
title: Don't ignore first action when assign and unassign quick actions are used in
the same comment
merge_request: 21749
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment