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 diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 91cbb803f..5e6b1f7aa 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -24,4 +24,19 @@ module GroupsHelper {:name => 'memberships', :partial => 'groups/memberships', :label => :label_project_plural} ] end + + def render_principals_for_new_group_users(group) + scope = User.active.not_in_group(group).like(params[:q]) + principal_count = scope.count + principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page'] + principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all + + s = content_tag('div', principals_check_box_tags('user_ids[]', principals), :id => 'principals') + + links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {|text, parameters, options| + link_to text, autocomplete_for_user_group_path(group, parameters.merge(:q => params[:q], :format => 'js')), :remote => true + } + + s + content_tag('p', links, :class => 'pagination') + end end diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index d56fc6179..eb06a3977 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -18,4 +18,18 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. module MembersHelper + def render_principals_for_new_members(project) + scope = Principal.active.not_member_of(project).like(params[:q]).order('type, login, lastname ASC') + principal_count = scope.count + principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page'] + principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all + + s = content_tag('div', principals_check_box_tags('membership[user_ids][]', principals), :id => 'principals') + + links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {|text, parameters, options| + link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true + } + + s + content_tag('p', links, :class => 'pagination') + end end diff --git a/app/views/groups/_users.html.erb b/app/views/groups/_users.html.erb index 8bd76e90e..a0f89d76f 100644 --- a/app/views/groups/_users.html.erb +++ b/app/views/groups/_users.html.erb @@ -22,22 +22,18 @@