kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rails3: model: replace deprecated validate method at watcher model

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8072 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-12-04 09:45:18 +00:00
parent 93603f383a
commit bddd19c1e6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/watcher.rb
View File

@ -21,6 +21,7 @@ class Watcher < ActiveRecord::Base
validates_presence_of :user validates_presence_of :user
validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id] validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]
validate :validate_user
# Unwatch things that users are no longer allowed to view # Unwatch things that users are no longer allowed to view
def self.prune(options={}) def self.prune(options={})
@ -37,7 +38,7 @@ class Watcher < ActiveRecord::Base
protected protected
def validate def validate_user
errors.add :user_id, :invalid unless user.nil? || user.active? errors.add :user_id, :invalid unless user.nil? || user.active?
end end