Unverified Commit af9d7faf authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Adopt Group#members page for large groups (> 100 users)

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 4b93299dd685
......@@ -65,6 +65,7 @@
@import "sections/wall.scss";
@import "sections/dashboard.scss";
@import "sections/stat_graph.scss";
@import "sections/groups.scss";
* Code ighlight
.new-group-member-holder {
margin-top: 50px;
background: #f9f9f9;
padding-top: 20px;
.member-search-form {
float: left;
......@@ -63,7 +63,14 @@ def issues
def members
@project = group.projects.find(params[:project_id]) if params[:project_id]
@members = group.users_groups.order('group_access DESC')
@members = group.users_groups
if params[:search].present?
users = group.users.search(params[:search])
@members = @members.where(user_id: users)
@members = @members.order('group_access DESC').page(params[:page]).per(50)
@users_group = UsersGroup.new
= form_for @users_group, url: group_users_groups_path(@group), html: { class: 'form-horizontal users-group-form' } do |f|
New member(s) for
%strong #{@group.name}
%p 1. Choose users you want in the group
= f.label :user_ids, "People", class: 'control-label'
.col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large')
%p 2. Set access level for them
= f.label :group_access, "Group Access", class: 'control-label'
.col-sm-10= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select select2"
......@@ -6,14 +6,34 @@
%strong= link_to "here", help_permissions_path, class: "vlink"
= form_tag members_group_path(@group), method: :get, class: 'form-inline member-search-form' do
= search_field_tag :search, params[:search], { placeholder: 'Find member by name', class: 'form-control search-text-input input-mn-300' }
= submit_tag 'Search', class: 'btn'
- if current_user.can? :manage_group, @group
= link_to '#', class: 'btn btn-new js-toggle-visibility-link' do
Add members
= render "new_group_member"
%strong #{@group.name}
group members
- @members.each do |member|
= render 'users_groups/users_group', member: member, show_controls: true
- if current_user.can? :manage_group, @group
= render "new_group_member"
= paginate @members, theme: 'gitlab'
$('form.member-search-form').on 'submit', (event) ->
Turbolinks.visit @.action + '?' + $(@).serialize()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment