Commit 43cad71f1adbefe462f1c7216c8323c3f36704f4
1 parent
2cb0a62f
Exists in
master
and in
4 other branches
Duplicate code removed from IssueObserver#after_update
Showing
1 changed file
with
6 additions
and
10 deletions
Show diff stats
app/observers/issue_observer.rb
| @@ -10,17 +10,13 @@ class IssueObserver < ActiveRecord::Observer | @@ -10,17 +10,13 @@ class IssueObserver < ActiveRecord::Observer | ||
| 10 | def after_update(issue) | 10 | def after_update(issue) |
| 11 | send_reassigned_email(issue) if issue.is_being_reassigned? | 11 | send_reassigned_email(issue) if issue.is_being_reassigned? |
| 12 | 12 | ||
| 13 | - if issue.is_being_closed? | ||
| 14 | - Note.create_status_change_note(issue, current_user, 'closed') | 13 | + status = nil |
| 14 | + status = 'closed' if issue.is_being_closed? | ||
| 15 | + status = 'reopened' if issue.is_being_reopened? | ||
| 16 | + if status | ||
| 17 | + Note.create_status_change_note(issue, current_user, status) | ||
| 15 | [issue.author, issue.assignee].compact.each do |recipient| | 18 | [issue.author, issue.assignee].compact.each do |recipient| |
| 16 | - Notify.issue_status_changed_email(recipient.id, issue.id, 'closed', current_user) | ||
| 17 | - end | ||
| 18 | - end | ||
| 19 | - | ||
| 20 | - if issue.is_being_reopened? | ||
| 21 | - Note.create_status_change_note(issue, current_user, 'reopened') | ||
| 22 | - [issue.author, issue.assignee].compact.each do |recipient| | ||
| 23 | - Notify.issue_status_changed_email(recipient.id, issue.id, 'reopened', current_user) | 19 | + Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) |
| 24 | end | 20 | end |
| 25 | end | 21 | end |
| 26 | end | 22 | end |