From 706f8b1691cdf401d0c135afa5ec9d9f22d04838 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 25 Mar 2012 19:52:24 +0000 Subject: [PATCH] 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 --- test/unit/watcher_test.rb | 7 +++++++ .../acts_as_watchable/lib/acts_as_watchable.rb | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/test/unit/watcher_test.rb b/test/unit/watcher_test.rb index 35651179e..564cd0503 100644 --- a/test/unit/watcher_test.rb +++ b/test/unit/watcher_test.rb @@ -81,6 +81,13 @@ class WatcherTest < ActiveSupport::TestCase assert issue.watched_by?(User.find(1)) end + def test_watcher_user_ids_should_make_ids_uniq + issue = Issue.new(:project => Project.find(1), :tracker_id => 1, :subject => "test", :author => User.find(2)) + issue.watcher_user_ids = ['1', '3', '1'] + issue.save! + assert_equal 2, issue.watchers.count + end + def test_addable_watcher_users addable_watcher_users = @issue.addable_watcher_users assert_kind_of Array, addable_watcher_users diff --git a/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb index 96cb3a157..5420da0fe 100644 --- a/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb +++ b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb @@ -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 }) -- 2.39.5