Fixed: watchers selection lost when issue creation fails (#5406). #watched_by?…

Fixed: watchers selection lost when issue creation fails (#5406). #watched_by? was fixed in order to work with #watcher_user_ids= used in controllers on unsaved objects. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3705 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: watchers selection lost when issue creation fails (#5406). #watched_by?…
Fixed: watchers selection lost when issue creation fails (#5406). #watched_by? was fixed in order to work with #watcher_user_ids= used in controllers on unsaved objects. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3705 e93f8b46-1217-0410-a6f0-8f06a7374b81
a00d1eab · Jean-Philippe Lang · e5180884 · a00d1eab · a00d1eab
Commit a00d1eab authored Apr 30, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

watcher_test.rb test/unit/watcher_test.rb +6 -0

acts_as_watchable.rb vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb +2 -2

No files found.
--- a/test/unit/watcher_test.rb
+++ b/test/unit/watcher_test.rb
@@ -47,6 +47,12 @@ class WatcherTest < ActiveSupport::TestCase
    assert Issue.watched_by(@user).include?(@issue)
  end
  
+  def test_watcher_user_ids
+    issue = Issue.new
+    issue.watcher_user_ids = ['1', '3']
+    assert issue.watched_by?(User.find(1))
+  end
+  
  def test_recipients
    @issue.watchers.delete_all
    @issue.reload

--- a/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
+++ b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
@@ -50,9 +50,9 @@ module Redmine
          watching ? add_watcher(user) : remove_watcher(user)
        end
        
-        # Returns true if object is watched by user
+        # Returns true if object is watched by +user+
        def watched_by?(user)
-          !!(user && self.watchers.detect {|w| w.user_id == user.id })
+          !!(user && self.watcher_user_ids.detect {|uid| uid == user.id })
        end
        
        # Returns an array of watchers' email addresses