summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-22 00:11:06 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-22 00:11:06 +0300
commitdc0f08f8d807c363e082f9ada7a1addeefdb554d (patch)
tree05d4752d7e8f1e20c882df0d072fbfb40a68a6bc
parent6577d3a49cf6f21b1e044339f9cb984a67e9fdab (diff)
downloadgitlab-ce-dc0f08f8d807c363e082f9ada7a1addeefdb554d.tar.gz
Show also group members on project page at admin area
-rw-r--r--app/controllers/admin/projects_controller.rb1
-rw-r--r--app/views/admin/projects/show.html.haml12
2 files changed, 13 insertions, 0 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index e73a54dd1a5..088174fd3b8 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -15,6 +15,7 @@ class Admin::ProjectsController < Admin::ApplicationController
def show
@repository = @project.repository
+ @group = @project.group
end
protected
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 92b8960151e..5e6658508e1 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -74,6 +74,18 @@
%i.icon-lock
Private
.span6
+ - if @group
+ .ui-box
+ %h5.title
+ %strong #{@group.name} Group
+ members (#{@group.users_groups.count})
+ .pull-right
+ = link_to admin_group_path(@group), class: 'btn btn-small' do
+ %i.icon-edit
+ %ul.well-list
+ - @group.users_groups.order('group_access DESC').each do |member|
+ = render 'users_groups/users_group', member: member, show_controls: false
+
.ui-box
%h5.title
Team