deac
/
gitlabhq
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3168 from jojosch/owner-link-admin-4.2 

Fix link to owner of group and team in admin interface (4.2)
4-2-stable
Dmitriy Zaporozhets 2013-03-07 08:28:10 -08:00
parent d67117b5a1 c9556c6b60
commit c90a98c55c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/groups/index.html.haml
View File

@ -28,7 +28,7 @@
%td= group.path
%td= group.projects.count
%td
= link_to group.owner_name, admin_user_path(group.owner_id)
= link_to group.owner_name, admin_user_path(group.owner)
%td.bgred
= link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-small"
= link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"

2
app/views/admin/teams/index.html.haml
View File

@ -30,7 +30,7 @@
%td= team.projects.count
%td= team.members.count
%td
= link_to team.owner.name, admin_user_path(team.owner_id)
= link_to team.owner.name, admin_user_path(team.owner)
%td.bgred
= link_to 'Rename', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn btn-small"
= link_to 'Destroy', admin_team_path(team), confirm: "REMOVE #{team.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"