Override watcher_user_ids= to make ids uniq (#10538).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9269 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-03-25 19:52:24 +00:00
parent 6115a079ec
commit 706f8b1691
2 changed files with 17 additions and 2 deletions
+10 -2
View File
@@ -9,8 +9,6 @@ module Redmine
module ClassMethods
def acts_as_watchable(options = {})
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, :validate => false
@@ -21,6 +19,8 @@ module Redmine
}
attr_protected :watcher_ids, :watcher_user_ids
end
send :include, Redmine::Acts::Watchable::InstanceMethods
alias_method_chain :watcher_user_ids=, :uniq_ids
end
end
@@ -54,6 +54,14 @@ module Redmine
watching ? add_watcher(user) : remove_watcher(user)
end
# Overrides watcher_user_ids= to make user_ids uniq
def watcher_user_ids_with_uniq_ids=(user_ids)
if user_ids.is_a?(Array)
user_ids = user_ids.uniq
end
send :watcher_user_ids_without_uniq_ids=, user_ids
end
# Returns true if object is watched by +user+
def watched_by?(user)
!!(user && self.watcher_user_ids.detect {|uid| uid == user.id })