diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-02 10:50:06 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-13 08:44:59 +0100 |
| commit | 3e19f1976f9a13fc1b13ec49b3ce31c3e114a454 (patch) | |
| tree | 2d8b839c9401822c44ea1cf44aeb748b4e3be808 /app/controllers/projects/project_members_controller.rb | |
| parent | cdc55db3452ca82f0dbdcdb631a1fc48abdf1f84 (diff) | |
| download | gitlab-ce-3e19f1976f9a13fc1b13ec49b3ce31c3e114a454.tar.gz | |
Fixed issue with invited users not showing up
Diffstat (limited to 'app/controllers/projects/project_members_controller.rb')
| -rw-r--r-- | app/controllers/projects/project_members_controller.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index 617dd9823b9..2175a5d8dcb 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -6,7 +6,19 @@ class Projects::ProjectMembersController < Projects::ApplicationController def index @groups = @project.project_group_links - @project_members = @project.team.members(!can?(current_user, :admin_project, @project)) + + members = [] + project_members = @project.project_members + project_members = project_members.non_invite unless can?(current_user, :admin_project, @project) + members << project_members.pluck(:id) + + if @project.group + group_members = @project.group.group_members + group_members = group_members.non_invite unless can?(current_user, :admin_project, @project) + members << group_members.pluck(:id) + end + + @project_members = Member.where(id: members) @project_members_size = @project_members.size if params[:search].present? |