Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
cdc55db3
Commit
cdc55db3
authored
Sep 02, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed members error
parent
b3d75ac5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/controllers/projects/project_members_controller.rb
app/controllers/projects/project_members_controller.rb
+1
-1
app/models/project_team.rb
app/models/project_team.rb
+2
-2
No files found.
app/controllers/projects/project_members_controller.rb
View file @
cdc55db3
...
...
@@ -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?
...
...
app/models/project_team.rb
View file @
cdc55db3
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment