Fixed: Email notifications are sent to watchers even if 'No events' setting is chosen (#7763).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5004 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: Email notifications are sent to watchers even if 'No events' setting is chosen (#7763).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5004 e93f8b46-1217-0410-a6f0-8f06a7374b81
dac912b3 · Jean-Philippe Lang · Eric Davis · 6f5707c2 · dac912b3 · dac912b3
Commit dac912b3 authored Mar 04, 2011 by Jean-Philippe Lang Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

watcher_test.rb test/unit/watcher_test.rb +5 -5

acts_as_watchable.rb vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb +2 -1

No files found.
--- a/test/unit/watcher_test.rb
+++ b/test/unit/watcher_test.rb
@@ -60,15 +60,15 @@ class WatcherTest < ActiveSupport::TestCase
    assert @issue.watcher_recipients.empty?
    assert @issue.add_watcher(@user)

-    @user.mail_notification = true
-    @user.save    
+    @user.mail_notification = 'all'
+    @user.save!
    @issue.reload
    assert @issue.watcher_recipients.include?(@user.mail)

-    @user.mail_notification = false
-    @user.save    
+    @user.mail_notification = 'none'
+    @user.save!
    @issue.reload
-    assert @issue.watcher_recipients.include?(@user.mail)
+    assert !@issue.watcher_recipients.include?(@user.mail)
  end
  
  def test_unwatch

--- a/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
+++ b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
@@ -58,7 +58,8 @@ module Redmine
        # Returns an array of watchers' email addresses
        def watcher_recipients
          notified = watcher_users.active
-
+          notified.reject! {|user| user.mail_notification == 'none'}
+          
          if respond_to?(:visible?)
            notified.reject! {|user| !visible?(user)}
          end