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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
72139167
Commit
72139167
authored
Aug 26, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mockup of shared group memeber list at project member page.
parent
b9dc8e59
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
app/controllers/projects/team_members_controller.rb
app/controllers/projects/team_members_controller.rb
+1
-0
app/views/projects/team_members/index.html.haml
app/views/projects/team_members/index.html.haml
+20
-0
No files found.
app/controllers/projects/team_members_controller.rb
View file @
72139167
...
@@ -7,6 +7,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
...
@@ -7,6 +7,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
def
index
def
index
@group
=
@project
.
group
@group
=
@project
.
group
@users_projects
=
@project
.
users_projects
.
order
(
'project_access DESC'
)
@users_projects
=
@project
.
users_projects
.
order
(
'project_access DESC'
)
@project_group_links
=
@project
.
project_group_links
end
end
def
new
def
new
...
...
app/views/projects/team_members/index.html.haml
View file @
72139167
...
@@ -14,3 +14,23 @@
...
@@ -14,3 +14,23 @@
=
render
"team"
,
members:
@users_projects
=
render
"team"
,
members:
@users_projects
-
if
@group
-
if
@group
=
render
"group_members"
=
render
"group_members"
-
if
@project_group_links
.
any?
-
@project_group_links
.
each
do
|
group_links
|
-
shared_group
=
group_links
.
group
-
shared_group_users_count
=
group_links
.
group
.
users_groups
.
count
.panel.panel-default
.panel-heading
Shared with
%strong
#{
shared_group
.
name
}
group, members with
%strong
#{
group_links
.
human_access
}
role (
#{
shared_group_users_count
}
)
.pull-right
=
link_to
members_group_path
(
shared_group
),
class:
'btn btn-small'
do
%i
.icon-edit
%ul
.well-list
-
shared_group
.
users_groups
.
order
(
'group_access DESC'
).
limit
(
20
).
each
do
|
member
|
=
render
'users_groups/users_group'
,
member:
member
,
show_controls:
false
,
show_roles:
false
-
if
shared_group_users_count
>
20
%li
and
#{
shared_group_users_count
-
20
}
more. For full list visit
#{
link_to
'group members page'
,
members_group_path
(
shared_group
)
}
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