##// END OF EJS Templates
Merged r3705 from trunk....
Jean-Philippe Lang -
r3601:b26d0fe0411c
parent child
Show More
@@ -47,6 +47,12 class WatcherTest < ActiveSupport::TestCase
47 assert Issue.watched_by(@user).include?(@issue)
47 assert Issue.watched_by(@user).include?(@issue)
48 end
48 end
49
49
50 def test_watcher_user_ids
51 issue = Issue.new
52 issue.watcher_user_ids = ['1', '3']
53 assert issue.watched_by?(User.find(1))
54 end
55
50 def test_recipients
56 def test_recipients
51 @issue.watchers.delete_all
57 @issue.watchers.delete_all
52 @issue.reload
58 @issue.reload
@@ -46,9 +46,9 module Redmine
46 watching ? add_watcher(user) : remove_watcher(user)
46 watching ? add_watcher(user) : remove_watcher(user)
47 end
47 end
48
48
49 # Returns true if object is watched by user
49 # Returns true if object is watched by +user+
50 def watched_by?(user)
50 def watched_by?(user)
51 !!(user && self.watchers.detect {|w| w.user_id == user.id })
51 !!(user && self.watcher_user_ids.detect {|uid| uid == user.id })
52 end
52 end
53
53
54 # Returns an array of watchers' email addresses
54 # Returns an array of watchers' email addresses
General Comments 0
You need to be logged in to leave comments. Login now