Merge branch 'control-dropdown-permissions' into 'master'
Hide group control nav if no options present ## What does this MR do? Hides the group nav controls if no options present in the dropdown. Also fixed the alignment of the dropdown to match the project page. ## What are the relevant issue numbers? Closes #19120 See merge request !5155
This commit is contained in:
commit
1c4e866348
|
@ -1,5 +1,5 @@
|
|||
= render 'layouts/nav/group_settings'
|
||||
.scrolling-tabs-container{ class: nav_control_class }
|
||||
= render 'layouts/nav/group_settings'
|
||||
.fade-left
|
||||
= icon('angle-left')
|
||||
.fade-right
|
||||
|
|
|
@ -1,22 +1,26 @@
|
|||
- if current_user
|
||||
- can_admin_group = can?(current_user, :admin_group, @group)
|
||||
- can_edit = can?(current_user, :admin_group, @group)
|
||||
- member = @group.members.find_by(user_id: current_user.id)
|
||||
- can_leave = member && can?(current_user, :destroy_group_member, member)
|
||||
|
||||
.controls
|
||||
.dropdown.group-settings-dropdown
|
||||
%a.dropdown-new.btn.btn-default#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
|
||||
= icon('cog')
|
||||
= icon('caret-down')
|
||||
%ul.dropdown-menu.dropdown-menu-align-right
|
||||
= nav_link(path: 'groups#projects') do
|
||||
= link_to 'Projects', projects_group_path(@group), title: 'Projects'
|
||||
%li.divider
|
||||
- if can_edit
|
||||
%li
|
||||
= link_to 'Edit Group', edit_group_path(@group)
|
||||
- if can_leave
|
||||
%li
|
||||
= link_to polymorphic_path([:leave, @group, :members]),
|
||||
data: { confirm: leave_confirmation_message(@group) }, method: :delete, title: 'Leave group' do
|
||||
Leave Group
|
||||
- if can_admin_group || can_edit || can_leave
|
||||
.controls
|
||||
.dropdown.group-settings-dropdown
|
||||
%a.dropdown-new.btn.btn-default#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
|
||||
= icon('cog')
|
||||
= icon('caret-down')
|
||||
%ul.dropdown-menu.dropdown-menu-align-right
|
||||
- if can_admin_group
|
||||
= nav_link(path: 'groups#projects') do
|
||||
= link_to 'Projects', projects_group_path(@group), title: 'Projects'
|
||||
- if can_edit || can_leave
|
||||
%li.divider
|
||||
- if can_edit
|
||||
%li
|
||||
= link_to 'Edit Group', edit_group_path(@group)
|
||||
- if can_leave
|
||||
%li
|
||||
= link_to polymorphic_path([:leave, @group, :members]),
|
||||
data: { confirm: leave_confirmation_message(@group) }, method: :delete, title: 'Leave group' do
|
||||
Leave Group
|
||||
|
|
Loading…
Reference in New Issue