diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-13 18:16:51 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-15 15:49:41 +0300 |
| commit | 99f995755ef4b445216dd7baae35f5a4846ef30c (patch) | |
| tree | 1fdbd02c7cffc2f21faefaa80dea43f6cebecb0a /app/views/dashboard | |
| parent | 60df262c38d7c235b483cc1c4beb12f793e0e58a (diff) | |
Use `group_member` instead of `users_group` or `membership`.
Diffstat (limited to 'app/views/dashboard')
| -rw-r--r-- | app/views/dashboard/groups/index.html.haml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml index c232644b021..76f7d660f36 100644 --- a/app/views/dashboard/groups/index.html.haml +++ b/app/views/dashboard/groups/index.html.haml @@ -11,10 +11,10 @@ .panel.panel-default .panel-heading %strong Groups - (#{@user_groups.count}) + (#{@group_members.count}) %ul.well-list - - @user_groups.each do |user_group| - - group = user_group.group + - @group_members.each do |group_member| + - group = group_member.group %li .pull-right - if can?(current_user, :manage_group, group) @@ -22,7 +22,7 @@ %i.fa.fa-cogs Settings - - if can?(current_user, :destroy, user_group) + - if can?(current_user, :destroy_group_member, group_member) = link_to leave_dashboard_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Remove user from group' do %i.fa.fa-sign-out Leave @@ -32,9 +32,9 @@ %strong= group.name as - %strong #{user_group.human_access} + %strong #{group_member.human_access} %div.light #{pluralize(group.projects.count, "project")}, #{pluralize(group.users.count, "user")} -= paginate @user_groups += paginate @group_members |