jro_apps/redmine Commit - r3591:a00d1eabd7c4

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....

Jean-Philippe Lang -

r3591:a00d1eabd7c4

parent child

Context file:

r3591:a00d1eabd7c4

Collapse all files

test/unit/watcher_test.rb +6 0

                 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

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

                       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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages