From a525bc8e98f6e7c88a820ca42df54e58d92a5d1c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 19 Jan 2014 10:01:14 +0000
Subject: Don't display default watchers checkboxes on the new issue form when
 there are more than 20 members (#8562).

git-svn-id: http://svn.redmine.org/redmine/trunk@12673 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/watchers/_new.html.erb | 6 +-----
 app/views/watchers/create.js.erb | 2 +-
 app/views/watchers/new.js.erb    | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'app/views')

diff --git a/app/views/watchers/_new.html.erb b/app/views/watchers/_new.html.erb
index e3443a1cd..6282d59aa 100644
--- a/app/views/watchers/_new.html.erb
+++ b/app/views/watchers/_new.html.erb
@@ -17,11 +17,7 @@
                  :project_id => @project) }')" %>
 
   <div id="users_for_watcher">
-    <%= principals_check_box_tags(
-            'watcher[user_ids][]',
-            (watched ?
-               watched.addable_watcher_users : User.active.limit(100).all)
-           ) %>
+    <%= principals_check_box_tags('watcher[user_ids][]', users) %>
   </div>
 
   <p class="buttons">
diff --git a/app/views/watchers/create.js.erb b/app/views/watchers/create.js.erb
index 0f7e15a00..ba8e580af 100644
--- a/app/views/watchers/create.js.erb
+++ b/app/views/watchers/create.js.erb
@@ -1,2 +1,2 @@
-$('#ajax-modal').html('<%= escape_javascript(render(:partial => 'watchers/new', :locals => {:watched => @watched})) %>');
+$('#ajax-modal').html('<%= escape_javascript(render(:partial => 'watchers/new', :locals => {:watched => @watched, :users => @users})) %>');
 $('#watchers').html('<%= escape_javascript(render(:partial => 'watchers/watchers', :locals => {:watched => @watched})) %>');
diff --git a/app/views/watchers/new.js.erb b/app/views/watchers/new.js.erb
index 6b99f657e..8ff5dacc9 100644
--- a/app/views/watchers/new.js.erb
+++ b/app/views/watchers/new.js.erb
@@ -1,3 +1,3 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'watchers/new', :locals => {:watched => @watched}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'watchers/new', :locals => {:watched => @watched, :users => @users}) %>');
 showModal('ajax-modal', '400px');
 $('#ajax-modal').addClass('new-watcher');
-- 
cgit v1.2.3