root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed members error

This commit is contained in:
Phil Hughes 2016-09-02 10:13:49 +01:00
parent b3d75ac513
commit cdc55db345
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects/project_members_controller.rb
View File

@ -6,7 +6,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
def index
@groups = @project.project_group_links
@project_members = @project.team.members(can?(current_user, :admin_project, @project))
@project_members = @project.team.members(!can?(current_user, :admin_project, @project))
@project_members_size = @project_members.size
if params[:search].present?

4
app/models/project_team.rb
View File

@ -52,7 +52,7 @@ class ProjectTeam
ProjectMember.truncate_team(project)
end
def members(non_invite)
def members(non_invite = false)
@members ||= fetch_members(nil, non_invite)
end
alias_method :users, :members
@ -236,7 +236,7 @@ class ProjectTeam
end
user_ids = project_members.pluck(:user_id)
user_ids.push(*invited_members.map(&:user_id)) if invited_members.any? && !non_invite
user_ids.push(*invited_members.map(&:user_id)) if invited_members.any? && non_invite
user_ids.push(*group_members.pluck(:user_id)) if group
User.where(id: user_ids)