From c8b722456c5d73e0a85c2073cd3fd7cd5c35a29c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 5 Nov 2012 15:49:07 +0000 Subject: Fixed that watchers receive notifications for private comments without permission (#12286). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10789 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb b/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb index 1f8877584..c284af38d 100644 --- a/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb +++ b/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb @@ -67,15 +67,18 @@ module Redmine !!(user && self.watcher_user_ids.detect {|uid| uid == user.id }) end - # Returns an array of watchers' email addresses - def watcher_recipients + def notified_watchers notified = watcher_users.active - notified.reject! {|user| user.mail_notification == 'none'} - + notified.reject! {|user| user.mail.blank? || user.mail_notification == 'none'} if respond_to?(:visible?) notified.reject! {|user| !visible?(user)} end - notified.collect(&:mail).compact + notified + end + + # Returns an array of watchers' email addresses + def watcher_recipients + notified_watchers.collect(&:mail) end module ClassMethods; end -- cgit v1.2.3