Commit d19b68b6 authored by Maurizio De Santis's avatar Maurizio De Santis

Update 'removed assignee' note to include old assignee reference

parent 8a7bbe1f
...@@ -68,21 +68,14 @@ module SystemNoteService ...@@ -68,21 +68,14 @@ module SystemNoteService
# #
# Returns the created Note object # Returns the created Note object
def change_issue_assignees(issue, project, author, old_assignees) def change_issue_assignees(issue, project, author, old_assignees)
body = unassigned_users = old_assignees - issue.assignees
if issue.assignees.any? && old_assignees.any? added_users = issue.assignees.to_a - old_assignees
unassigned_users = old_assignees - issue.assignees
added_users = issue.assignees.to_a - old_assignees text_parts = []
text_parts << "assigned to #{added_users.map(&:to_reference).to_sentence}" if added_users.any?
text_parts = [] text_parts << "unassigned #{unassigned_users.map(&:to_reference).to_sentence}" if unassigned_users.any?
text_parts << "assigned to #{added_users.map(&:to_reference).to_sentence}" if added_users.any?
text_parts << "unassigned #{unassigned_users.map(&:to_reference).to_sentence}" if unassigned_users.any? body = text_parts.join(' and ')
text_parts.join(' and ')
elsif old_assignees.any?
"removed assignee"
elsif issue.assignees.any?
"assigned to #{issue.assignees.map(&:to_reference).to_sentence}"
end
create_note(NoteSummary.new(issue, project, author, body, action: 'assignee')) create_note(NoteSummary.new(issue, project, author, body, action: 'assignee'))
end end
......
---
title: "Update 'removed assignee' note to include old assignee reference"
merge_request: 16301
author: Maurizio De Santis
type: changed
...@@ -158,7 +158,7 @@ describe SystemNoteService do ...@@ -158,7 +158,7 @@ describe SystemNoteService do
end end
it 'builds a correct phrase when assignee removed' do it 'builds a correct phrase when assignee removed' do
expect(build_note([assignee1], [])).to eq 'removed assignee' expect(build_note([assignee1], [])).to eq "unassigned @#{assignee1.username}"
end end
it 'builds a correct phrase when assignees changed' do it 'builds a correct phrase when assignees changed' do
......
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