From cdc55db3452ca82f0dbdcdb631a1fc48abdf1f84 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 2 Sep 2016 10:13:49 +0100
Subject: [PATCH] Fixed members error
---
app/controllers/projects/project_members_controller.rb | 2 +-
app/models/project_team.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index cd31653698c..617dd9823b9 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -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?
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 57925a0861a..a58c56288dd 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -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)
--
GitLab