diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-16 09:50:55 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-16 09:50:55 +0300 |
| commit | bacb05c554dfa8781c53c1db7a4f9a706e33fd50 (patch) | |
| tree | dc7f0b432421e548f2ab734b2c3564efc2a473e5 /app | |
| parent | aad3cbeec52cf5bbb5a2c724eeb9b946be6f0fe9 (diff) | |
Small improvements to group/project member rows
Diffstat (limited to 'app')
3 files changed, 5 insertions, 2 deletions
diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml index 3d120c5cdd7..003025221b2 100644 --- a/app/views/groups/group_members/_group_member.html.haml +++ b/app/views/groups/group_members/_group_member.html.haml @@ -22,6 +22,7 @@ title: 'Edit access level', type: 'button' do %i.fa.fa-pencil-square-o - if can?(current_user, :destroy_group_member, member) + - if current_user == user = link_to leave_group_group_members_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-xs btn btn-remove", title: 'Remove user from group' do %i.fa.fa-minus.fa-inverse diff --git a/app/views/projects/project_members/_group_members.html.haml b/app/views/projects/project_members/_group_members.html.haml index b050be1d21b..43e92437cf5 100644 --- a/app/views/projects/project_members/_group_members.html.haml +++ b/app/views/projects/project_members/_group_members.html.haml @@ -4,9 +4,10 @@ group members %small (#{members.count}) - .pull-right + .panel-head-actions = link_to group_group_members_path(@group), class: 'btn btn-sm' do %i.fa.fa-pencil-square-o + Edit group members %ul.well-list - members.each do |member| = render 'groups/group_members/group_member', member: member, show_controls: false diff --git a/app/views/projects/project_members/_project_member.html.haml b/app/views/projects/project_members/_project_member.html.haml index 368d9419de3..1f31d84dd1d 100644 --- a/app/views/projects/project_members/_project_member.html.haml +++ b/app/views/projects/project_members/_project_member.html.haml @@ -20,13 +20,14 @@ title: 'Edit access level', type: 'button' do %i.fa.fa-pencil-square-o + - if current_user == user = link_to leave_namespace_project_project_members_path(@project.namespace, @project), data: { confirm: "Leave project?"}, method: :delete, class: "btn-xs btn btn-remove", title: 'Leave project' do %i.fa.fa-minus.fa-inverse - else = link_to namespace_project_project_member_path(@project.namespace, @project, user), data: { confirm: remove_from_project_team_message(@project, user) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'Remove user from team' do %i.fa.fa-minus.fa-inverse - + .edit-member.hide.js-toggle-content = form_for member, as: :project_member, url: namespace_project_project_member_path(@project.namespace, @project, member.user), remote: true do |f| .alert.prepend-top-20 |