diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-08 10:45:53 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-13 08:44:59 +0100 |
| commit | 7cca8ffe60f4cdc7ca012cf223c6d7855b928685 (patch) | |
| tree | 9cb44f72b7e9a8a0e5c872f3c8e33ca4cc2c86bb | |
| parent | 2abbb0980f061d4297aab02f914c324c7fbe073b (diff) | |
| download | gitlab-ce-7cca8ffe60f4cdc7ca012cf223c6d7855b928685.tar.gz | |
Ruby update
| -rw-r--r-- | app/controllers/projects/project_members_controller.rb | 14 | ||||
| -rw-r--r-- | app/views/projects/project_members/_team.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/project_members/index.html.haml | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index 64cbc76da6f..1c49ebfb99d 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -7,15 +7,15 @@ class Projects::ProjectMembersController < Projects::ApplicationController def index @groups = @project.project_group_links - project_members = @project.project_members - project_members = project_members.non_invite unless can?(current_user, :admin_project, @project) + @project_members = @project.project_members + @project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project) - members_ids = project_members.pluck(:id) - - @members = Member.where(id: members_ids.flatten) - @members_size = @members.size + if params[:search].present? + users = @project.users.search(params[:search]).to_a + @project_members = @project_members.where(user_id: users) + end - @members = @members.page(params[:page]) + @project_members = @project_members.page(params[:page]) @requesters = @project.requesters if can?(current_user, :admin_project, @project) diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml index d9799033e17..ff54035cfe1 100644 --- a/app/views/projects/project_members/_team.html.haml +++ b/app/views/projects/project_members/_team.html.haml @@ -2,7 +2,7 @@ .panel-heading Users with access to %strong #{@project.name} - %span.badge= @members_size + %span.badge= @project_members.total_count %ul.content-list - members.each do |member| = render 'shared/members/member', member: member diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 86b2752cc0b..f566748e95a 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -25,5 +25,5 @@ - if @groups.size > 0 = render 'groups', groups: @groups - = render 'team', members: @members - = paginate @members, theme: "gitlab" + = render 'team', members: @project_members + = paginate @project_members, theme: "gitlab" |