diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-18 17:57:16 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-18 17:57:16 +0000 |
commit | 1257f1960ff6d59b2f3f7890777d3481f1800430 (patch) | |
tree | 6be67b6fc92cb8a408ed002fc6fe219ea566bb9a /app/controllers | |
parent | 10c96dba8b79822e1d54ef58bb8139851cf30c80 (diff) | |
download | redmine-1257f1960ff6d59b2f3f7890777d3481f1800430.tar.gz redmine-1257f1960ff6d59b2f3f7890777d3481f1800430.zip |
Adds pagination to users list when adding project or group members (#9549).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11200 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/groups_controller.rb | 5 | ||||
-rw-r--r-- | app/controllers/members_controller.rb | 5 | ||||
-rw-r--r-- | app/controllers/projects_controller.rb | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index d0a9dad09..b2f9d6af5 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -109,8 +109,9 @@ class GroupsController < ApplicationController end def autocomplete_for_user - @users = User.active.not_in_group(@group).like(params[:q]).all(:limit => 100) - render :layout => false + respond_to do |format| + format.js + end end def edit_membership diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 54b3a5cbe..c46b62879 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -112,8 +112,9 @@ class MembersController < ApplicationController end def autocomplete - @principals = Principal.active.not_member_of(@project).like(params[:q]).all(:limit => 100) - render :layout => false + respond_to do |format| + format.js + end end private diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 054b8bb47..a3527a550 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -43,6 +43,7 @@ class ProjectsController < ApplicationController helper :repositories include RepositoriesHelper include ProjectsHelper + helper :members # Lists visible projects def index |