Moves watchers filtering logic to ActsAsWatchable.

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

Moves watchers filtering logic to ActsAsWatchable.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3168 e93f8b46-1217-0410-a6f0-8f06a7374b81
6610bb6b · Jean-Philippe Lang · f3323118 · 6610bb6b · 6610bb6b
Commit 6610bb6b authored Dec 13, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 8 deletions

issue.rb app/models/issue.rb +0 -7

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

No files found.
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -314,13 +314,6 @@ class Issue < ActiveRecord::Base
    notified.collect(&:mail)
  end
  
-  # Returns the mail adresses of watchers that should be notified
-  def watcher_recipients
-    notified = watcher_users
-    notified.reject! {|user| !user.active? || !visible?(user)}
-    notified.collect(&:mail)
-  end
-  
  # Returns the total number of hours spent on this issue.
  #
  # Example:

--- a/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
+++ b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
@@ -53,7 +53,11 @@ module Redmine
        
        # Returns an array of watchers' email addresses
        def watcher_recipients
-          self.watchers.collect { |w| w.user.mail if w.user.active? }.compact
+          notified = watchers.collect(&:user).select(&:active?)
+          if respond_to?(:visible?)
+            notified.reject! {|user| !visible?(user)}
+          end
+          notified.collect(&:mail).compact
        end

        module ClassMethods