Rails3: model: replace deprecated validate method at watcher model
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8072 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
93603f383a
commit
bddd19c1e6
|
@ -21,6 +21,7 @@ class Watcher < ActiveRecord::Base
|
|||
|
||||
validates_presence_of :user
|
||||
validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]
|
||||
validate :validate_user
|
||||
|
||||
# Unwatch things that users are no longer allowed to view
|
||||
def self.prune(options={})
|
||||
|
@ -37,7 +38,7 @@ class Watcher < ActiveRecord::Base
|
|||
|
||||
protected
|
||||
|
||||
def validate
|
||||
def validate_user
|
||||
errors.add :user_id, :invalid unless user.nil? || user.active?
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue