Merged r3705 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3715 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
98f3e98d82
commit
b26d0fe041
2 files changed
+8
-2
No files matched your search
@@ -47,6 +47,12 @@ class WatcherTest < ActiveSupport::TestCase
|
|||||||
assert Issue.watched_by(@user).include?(@issue)
|
assert Issue.watched_by(@user).include?(@issue)
|
||||||
end
|
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
|
def test_recipients
|
||||||
@issue.watchers.delete_all
|
@issue.watchers.delete_all
|
||||||
@issue.reload
|
@issue.reload
|
||||||
|
|||||||
@@ -46,9 +46,9 @@ module Redmine
|
|||||||
watching ? add_watcher(user) : remove_watcher(user)
|
watching ? add_watcher(user) : remove_watcher(user)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns true if object is watched by user
|
# Returns true if object is watched by +user+
|
||||||
def 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
|
end
|
||||||
|
|
||||||
# Returns an array of watchers' email addresses
|
# Returns an array of watchers' email addresses
|
||||||
|
|||||||
Reference in new issue
Block a user