Commit 39f82b75 authored by Marin Jankovski's avatar Marin Jankovski

When assigning an unassigned issue send notification with the correct text.

parent 119b0287
...@@ -301,7 +301,9 @@ class NotificationService ...@@ -301,7 +301,9 @@ class NotificationService
end end
def reassign_resource_email(target, project, current_user, method) def reassign_resource_email(target, project, current_user, method)
recipients = User.where(id: [target.assignee_id, target.assignee_id_was]) assignee_id_was = previous_record(target, "assignee_id")
recipients = User.where(id: [target.assignee_id, assignee_id_was])
# Add watchers to email list # Add watchers to email list
recipients = recipients.concat(project_watchers(project)) recipients = recipients.concat(project_watchers(project))
...@@ -313,11 +315,20 @@ class NotificationService ...@@ -313,11 +315,20 @@ class NotificationService
recipients.delete(current_user) recipients.delete(current_user)
recipients.each do |recipient| recipients.each do |recipient|
mailer.send(method, recipient.id, target.id, target.assignee_id_was, current_user.id) mailer.send(method, recipient.id, target.id, assignee_id_was, current_user.id)
end end
end end
def mailer def mailer
Notify.delay Notify.delay
end end
def previous_record(object, attribute)
if object && attribute
if object.previous_changes.include?(attribute)
return object.previous_changes[attribute].first
end
end
nil
end
end end
...@@ -4,5 +4,8 @@ ...@@ -4,5 +4,8 @@
from from
%strong #{@previous_assignee.name} %strong #{@previous_assignee.name}
to to
- if @issue.assignee_id
%strong #{@issue.assignee_name} %strong #{@issue.assignee_name}
- else
%strong Unassigned
...@@ -2,4 +2,4 @@ Reassigned Issue <%= @issue.iid %> ...@@ -2,4 +2,4 @@ Reassigned Issue <%= @issue.iid %>
<%= url_for(project_issue_url(@issue.project, @issue)) %> <%= url_for(project_issue_url(@issue.project, @issue)) %>
Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @issue.assignee_name %> Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= "#{@issue.assignee_id ? @issue.assignee_name : 'Unassigned'}" %>
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