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
Jérome Perrin
gitlab-ce
Commits
23993147
Commit
23993147
authored
Sep 01, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with groups not displaying
parent
4afd17b2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
18 deletions
+2
-18
app/controllers/projects/project_members_controller.rb
app/controllers/projects/project_members_controller.rb
+0
-14
app/views/projects/project_members/index.html.haml
app/views/projects/project_members/index.html.haml
+2
-4
No files found.
app/controllers/projects/project_members_controller.rb
View file @
23993147
...
@@ -16,20 +16,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
...
@@ -16,20 +16,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@project_members
=
@project_members
.
order
(
'access_level DESC'
)
@project_members
=
@project_members
.
order
(
'access_level DESC'
)
@group
=
@project
.
group
if
@group
@group_members
=
@group
.
group_members
@group_members
=
@group_members
.
non_invite
unless
can?
(
current_user
,
:admin_group
,
@group
)
if
params
[
:search
].
present?
users
=
@group
.
users
.
search
(
params
[
:search
]).
to_a
@group_members
=
@group_members
.
where
(
user_id:
users
)
end
@group_members
=
@group_members
.
order
(
'access_level DESC'
)
end
@requesters
=
@project
.
requesters
if
can?
(
current_user
,
:admin_project
,
@project
)
@requesters
=
@project
.
requesters
if
can?
(
current_user
,
:admin_project
,
@project
)
@project_member
=
@project
.
project_members
.
new
@project_member
=
@project
.
project_members
.
new
...
...
app/views/projects/project_members/index.html.haml
View file @
23993147
...
@@ -21,9 +21,7 @@
...
@@ -21,9 +21,7 @@
.form-group
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
=
icon
(
"search"
)
=
icon
(
"search"
)
-
if
@gr
ups
-
if
@gr
oups
.
size
>
0
=
render
'groups'
,
groups:
@groups
=
render
'groups'
,
groups:
@groups
=
render
'team'
,
members:
@project_members
-
if
@group
=
render
'team'
,
members:
@project_members
=
render
"group_members"
,
members:
@group_members
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