kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r5004 from trunk. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5012 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-03-06 12:48:40 +00:00
parent c45044f13c
commit 4d0a955d3c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/unit/watcher_test.rb
View File

@ -60,15 +60,15 @@ class WatcherTest < ActiveSupport::TestCase
assert @issue.watcher_recipients.empty? assert @issue.watcher_recipients.empty?
assert @issue.add_watcher(@user) assert @issue.add_watcher(@user)
@user.mail_notification = true @user.mail_notification = 'all'
@user.save @user.save!
@issue.reload @issue.reload
assert @issue.watcher_recipients.include?(@user.mail) assert @issue.watcher_recipients.include?(@user.mail)
@user.mail_notification = false @user.mail_notification = 'none'
@user.save @user.save!
@issue.reload @issue.reload
assert @issue.watcher_recipients.include?(@user.mail) assert !@issue.watcher_recipients.include?(@user.mail)
end end
def test_unwatch def test_unwatch

3
vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb vendored
View File

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