comparison vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb @ 441:cbce1fd3b1b7 redmine-1.2

Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)

           return if self.included_modules.include?(Redmine::Acts::Watchable::InstanceMethods)          
           send :include, Redmine::Acts::Watchable::InstanceMethods
           
           class_eval do
             has_many :watchers, :as => :watchable, :dependent => :delete_all
-            has_many :watcher_users, :through => :watchers, :source => :user
+            has_many :watcher_users, :through => :watchers, :source => :user, :validate => false
             
             named_scope :watched_by, lambda { |user_id|
               { :include => :watchers,
                 :conditions => ["#{Watcher.table_name}.user_id = ?", user_id] }
             }

           base.extend ClassMethods
         end
         
         # Returns an array of users that are proposed as watchers
         def addable_watcher_users
-          self.project.users.sort - self.watcher_users
+          users = self.project.users.sort - self.watcher_users
+          if respond_to?(:visible?)
+            users.reject! {|user| !visible?(user)}
+          end
+          users
         end
         
         # Adds user as a watcher
         def add_watcher(user)
           self.watchers << Watcher.new(:user => user)

         end
         
         # 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
           notified.collect(&:mail).compact
         end