From bddd19c1e662e6e5565ec1b2968b2907780c35de 2011-12-04 09:45:18
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: 2011-12-04 09:45:18
Subject: [PATCH] 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

---

diff --git a/app/models/watcher.rb b/app/models/watcher.rb
index de11118..c42b55f 100644
--- a/app/models/watcher.rb
+++ b/app/models/watcher.rb
@@ -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