Download as
Browse Code »

Commit f49fb5dca1ecf2b1ae6415920de09b4d95c14bb1

Authored by Dmitriy Zaporozhets
1 parent ef9298fe
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix error when reassign issue/merge_request from non-assigned. Fixes #3201

Showing 6 changed files with 12 additions and 10 deletions   Show diff stats
app/mailers/emails/issues.rb
  Diff comments   View file @f49fb5d
@@ -8,7 +8,7 @@ module Emails @@ -8,7 +8,7 @@ module Emails
8 8
9 def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id) 9 def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id)
10 @issue = Issue.find(issue_id) 10 @issue = Issue.find(issue_id)
11 - @previous_assignee ||= User.find(previous_assignee_id) 11 + @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
12 @project = @issue.project 12 @project = @issue.project
13 mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.id}", @issue.title)) 13 mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.id}", @issue.title))
14 end 14 end
app/mailers/emails/merge_requests.rb
  Diff comments   View file @f49fb5d
@@ -8,7 +8,7 @@ module Emails @@ -8,7 +8,7 @@ module Emails
8 8
9 def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id) 9 def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)
10 @merge_request = MergeRequest.find(merge_request_id) 10 @merge_request = MergeRequest.find(merge_request_id)
11 - @previous_assignee ||= User.find(previous_assignee_id) 11 + @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
12 @project = @merge_request.project 12 @project = @merge_request.project
13 mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.id}", @merge_request.title)) 13 mail(to: recipient(recipient_id), subject: subject("changed merge request !#{@merge_request.id}", @merge_request.title))
14 end 14 end
app/views/notify/reassigned_issue_email.html.haml
  Diff comments   View file @f49fb5d
@@ -2,8 +2,10 @@ @@ -2,8 +2,10 @@
2 = "Reassigned Issue ##{@issue.id}" 2 = "Reassigned Issue ##{@issue.id}"
3 = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue) 3 = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)
4 %p 4 %p
5 - Assignee changed from  
6 - %strong #{@previous_assignee.name} 5 + Assignee changed
  6 + - if @previous_assignee
  7 + from
  8 + %strong #{@previous_assignee.name}
7 to 9 to
8 %strong #{@issue.assignee_name} 10 %strong #{@issue.assignee_name}
9 11
app/views/notify/reassigned_issue_email.text.erb
  Diff comments   View file @f49fb5d
@@ -2,6 +2,4 @@ Reassigned Issue <%= @issue.id %> @@ -2,6 +2,4 @@ Reassigned Issue <%= @issue.id %>
2 2
3 <%= url_for(project_issue_url(@issue.project, @issue)) %> 3 <%= url_for(project_issue_url(@issue.project, @issue)) %>
4 4
5 -  
6 -Assignee changed from <%= @previous_assignee.name %> to <%= @issue.assignee_name %>  
7 - 5 +Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @issue.assignee_name %>
app/views/notify/reassigned_merge_request_email.html.haml
  Diff comments   View file @f49fb5d
@@ -2,7 +2,9 @@ @@ -2,7 +2,9 @@
2 = "Reassigned Merge Request !#{@merge_request.id}" 2 = "Reassigned Merge Request !#{@merge_request.id}"
3 = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.project, @merge_request) 3 = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.project, @merge_request)
4 %p 4 %p
5 - Assignee changed from  
6 - %strong #{@previous_assignee.name} 5 + Assignee changed
  6 + - if @previous_assignee
  7 + from
  8 + %strong #{@previous_assignee.name}
7 to 9 to
8 %strong #{@merge_request.assignee_name} 10 %strong #{@merge_request.assignee_name}
app/views/notify/reassigned_merge_request_email.text.erb
  Diff comments   View file @f49fb5d
@@ -3,5 +3,5 @@ Reassigned Merge Request &lt;%= @merge_request.id %&gt; @@ -3,5 +3,5 @@ Reassigned Merge Request &lt;%= @merge_request.id %&gt;
3 <%= url_for(project_merge_request_url(@merge_request.project, @merge_request)) %> 3 <%= url_for(project_merge_request_url(@merge_request.project, @merge_request)) %>
4 4
5 5
6 -Assignee changed from <%= @previous_assignee.name %> to <%= @merge_request.assignee_name %> 6 +Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee %> to <%= @merge_request.assignee_name %>
7 7