diff app/models/journal_observer.rb @ 51:371eac10df0b live

* Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.

--- a/app/models/journal_observer.rb	Thu Oct 21 11:19:14 2010 +0100
+++ b/app/models/journal_observer.rb	Wed Nov 24 12:20:08 2010 +0000
@@ -17,6 +17,11 @@
 
 class JournalObserver < ActiveRecord::Observer
   def after_create(journal)
-    Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
+    if Setting.notified_events.include?('issue_updated') ||
+        (Setting.notified_events.include?('issue_note_added') && journal.notes.present?) ||
+        (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) ||
+        (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?)
+      Mailer.deliver_issue_edit(journal)
+    end
   end
 end