diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-02 18:57:02 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-02 18:57:02 +0200 |
| commit | 91995909d9ef6fc5540c7577987ed2244ac7862a (patch) | |
| tree | 8d1d30d22d97e636f75412185be425bccdacc918 | |
| parent | 0bda2d5d2bfd04161ed763c75e1bded90b73d8a5 (diff) | |
| download | gitlab-ce-91995909d9ef6fc5540c7577987ed2244ac7862a.tar.gz | |
Fix #2375. Admin and owner can manage groups
| -rw-r--r-- | app/models/ability.rb | 9 | ||||
| -rw-r--r-- | app/views/admin/projects/index.html.haml | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 2d80c6720b7..90929c5b512 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -107,9 +107,12 @@ class Ability def group_abilities user, group rules = [] - rules << [ - :manage_group - ] if group.owner == user + # Only group owner and administrators can manage group + if group.owner == user || user.admin? + rules << [ + :manage_group + ] + end rules.flatten end diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 0b9f91f7a5f..b56d7faa302 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -15,6 +15,7 @@ %i.icon-sort-down %th Path %th Team Members + %th Owner %th Last Commit %th Edit %th.cred Danger Zone! @@ -26,6 +27,8 @@ %td %span.monospace= project.path_with_namespace + ".git" %td= project.users_projects.count + %td + = link_to project.chief.name, [:admin, project.chief] %td= last_commit(project) %td= link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn small" %td.bgred= link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn small danger" |