Duplicate code removed from IssueObserver#after_update

1 files changed, 6 insertions, 10 deletions

diff --git a/app/observers/issue_observer.rb b/app/observers/issue_observer.rb
index dc5995cb09b..62fd9bf8ac9 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