From 080b2ac2fa5903f9744ddbd016d986973aec81ff Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 21 Jul 2016 17:21:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9ruby2.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb b/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb
index 06d661478..a26980c40 100644
--- a/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb
+++ b/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb
@@ -10,7 +10,11 @@ module Redmine
         def acts_as_watchable(options = {})
           return if self.included_modules.include?(Redmine::Acts::Watchable::InstanceMethods)
           class_eval do
-            has_many :watchers, :as => :watchable, :dependent => :delete_all
+            if self.name == 'User'
+              has_many :watchers, :dependent => :delete_all
+            else
+              has_many :watchers, :as => :watchable, :dependent => :delete_all
+            end
             has_many :watcher_users, :through => :watchers, :source => :user, :validate => false
 
             scope :watched_by, lambda { |user_id|