From 933dc946d4ba5d755e93be7fd15271ec9fb717ae 2016-04-09 07:54:43
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2016-04-09 07:54:43
Subject: [PATCH] Preload project when possible (#5754).

git-svn-id: http://svn.redmine.org/redmine/trunk@15314 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index 4888985..d9f2351 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -131,7 +131,12 @@ class WatchersController < ApplicationController
     klass = Object.const_get(params[:object_type].camelcase) rescue nil
     return unless klass && klass.respond_to?('watched_by')
 
-    objects = klass.where(:id => Array.wrap(params[:object_id])).to_a
+    scope = klass.where(:id => Array.wrap(params[:object_id]))
+    if klass.reflect_on_association(:project)
+      scope = scope.preload(:project => :enabled_modules)
+    end
+    objects = scope.to_a
+
     raise Unauthorized if objects.any? do |w|
       if w.respond_to?(:visible?)
         !w.visible?