diff app/models/watcher.rb @ 1338:25603efa57b5

Merge from live branch

--- a/app/models/watcher.rb	Wed Jan 23 13:11:25 2013 +0000
+++ b/app/models/watcher.rb	Thu Jun 20 13:14:14 2013 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -21,6 +21,7 @@
 
   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 @@
 
   protected
 
-  def validate
+  def validate_user
     errors.add :user_id, :invalid unless user.nil? || user.active?
   end