From 43cad71f1adbefe462f1c7216c8323c3f36704f4 Mon Sep 17 00:00:00 2001 From: Alex Denisov <1101.debian@gmail.com> Date: Wed, 29 Aug 2012 10:50:35 +0300 Subject: [PATCH] Duplicate code removed from IssueObserver#after_update --- app/observers/issue_observer.rb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app/observers/issue_observer.rb b/app/observers/issue_observer.rb index dc5995cb..62fd9bf8 100644 --- a/app/observers/issue_observer.rb +++ b/app/observers/issue_observer.rb @@ -10,17 +10,13 @@ class IssueObserver < ActiveRecord::Observer def after_update(issue) send_reassigned_email(issue) if issue.is_being_reassigned? - if issue.is_being_closed? - Note.create_status_change_note(issue, current_user, 'closed') + status = nil + status = 'closed' if issue.is_being_closed? + status = 'reopened' if issue.is_being_reopened? + if status + Note.create_status_change_note(issue, current_user, status) [issue.author, issue.assignee].compact.each do |recipient| - Notify.issue_status_changed_email(recipient.id, issue.id, 'closed', current_user) - end - end - - if issue.is_being_reopened? - Note.create_status_change_note(issue, current_user, 'reopened') - [issue.author, issue.assignee].compact.each do |recipient| - Notify.issue_status_changed_email(recipient.id, issue.id, 'reopened', current_user) + Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) end end end