diff options
author | Valery Sizov <valery@gitlab.com> | 2017-05-08 17:58:42 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2017-05-11 19:11:49 +0300 |
commit | 22722659c233efb3b65bb35286ff07c192e3fc85 (patch) | |
tree | b72aa69a8c5c0783f9762ab262e22649264c0373 /app/services | |
parent | 92bf7dfcb040e3e035fc87b0a70461f891284c98 (diff) | |
download | gitlab-ce-22722659c233efb3b65bb35286ff07c192e3fc85.tar.gz |
fix for Follow-up from "Backport of Multiple Assignees featurefixes_for_multiple_issue_assignees
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/issuable/bulk_update_service.rb | 14 | ||||
-rw-r--r-- | app/services/system_note_service.rb | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/services/issuable/bulk_update_service.rb b/app/services/issuable/bulk_update_service.rb index 40ff9b8b867..5d42a89fced 100644 --- a/app/services/issuable/bulk_update_service.rb +++ b/app/services/issuable/bulk_update_service.rb @@ -7,7 +7,7 @@ module Issuable ids = params.delete(:issuable_ids).split(",") items = model_class.where(id: ids) - %i(state_event milestone_id assignee_id assignee_ids add_label_ids remove_label_ids subscription_event).each do |key| + permitted_attrs(type).each do |key| params.delete(key) unless params[key].present? end @@ -26,5 +26,17 @@ module Issuable success: !items.count.zero? } end + + private + + def permitted_attrs(type) + attrs = %i(state_event milestone_id assignee_id assignee_ids add_label_ids remove_label_ids subscription_event) + + if type == 'issue' + attrs.push(:assignee_ids) + else + attrs.push(:assignee_id) + end + end end end diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 174e7c6e95b..0766df50ed2 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -79,7 +79,7 @@ module SystemNoteService text_parts.join(' and ') elsif old_assignees.any? - "removed all assignees" + "removed assignee" elsif issue.assignees.any? "assigned to #{issue.assignees.map(&:to_reference).to_sentence}" end |