Merge branch '48255-no-ui-element-to-edit-group-label' into 'master'
Resolve "No UI element to edit group label" Closes #48255 See merge request gitlab-org/gitlab-ce!20192
This commit is contained in:
commit
ee3d9b9dd5
|
@ -21,8 +21,9 @@
|
||||||
= sprite_icon('star-o')
|
= sprite_icon('star-o')
|
||||||
%button.label-action.remove-priority.btn.btn-transparent.has-tooltip{ title: _('Remove priority'), type: 'button', data: { placement: 'top' }, aria_label: _('Deprioritize label') }
|
%button.label-action.remove-priority.btn.btn-transparent.has-tooltip{ title: _('Remove priority'), type: 'button', data: { placement: 'top' }, aria_label: _('Deprioritize label') }
|
||||||
= sprite_icon('star')
|
= sprite_icon('star')
|
||||||
|
- if can?(current_user, :admin_label, label)
|
||||||
%li.inline
|
%li.inline
|
||||||
= link_to edit_label_path(label), class: 'btn btn-transparent label-action', aria_label: 'Edit label' do
|
= link_to edit_label_path(label), class: 'btn btn-transparent label-action edit', aria_label: 'Edit label' do
|
||||||
= sprite_icon('pencil')
|
= sprite_icon('pencil')
|
||||||
%li.inline
|
%li.inline
|
||||||
.dropdown
|
.dropdown
|
||||||
|
@ -42,9 +43,10 @@
|
||||||
container: 'body',
|
container: 'body',
|
||||||
toggle: 'modal' } }
|
toggle: 'modal' } }
|
||||||
= _('Promote to group label')
|
= _('Promote to group label')
|
||||||
%li
|
- if can?(current_user, :admin_label, label)
|
||||||
%span{ data: { toggle: 'modal', target: "#modal-delete-label-#{label.id}" } }
|
%li
|
||||||
%button.text-danger.remove-row{ type: 'button' }= _('Delete')
|
%span{ data: { toggle: 'modal', target: "#modal-delete-label-#{label.id}" } }
|
||||||
|
%button.text-danger.remove-row{ type: 'button' }= _('Delete')
|
||||||
- if current_user
|
- if current_user
|
||||||
%li.inline.label-subscription
|
%li.inline.label-subscription
|
||||||
- if can_subscribe_to_label_in_different_levels?(label)
|
- if can_subscribe_to_label_in_different_levels?(label)
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
|
feature 'Group labels' do
|
||||||
|
let(:user) { create(:user) }
|
||||||
|
let(:group) { create(:group) }
|
||||||
|
let!(:label) { create(:group_label, group: group) }
|
||||||
|
|
||||||
|
background do
|
||||||
|
group.add_owner(user)
|
||||||
|
sign_in(user)
|
||||||
|
visit group_labels_path(group)
|
||||||
|
end
|
||||||
|
|
||||||
|
scenario 'label has edit button', :js do
|
||||||
|
expect(page).to have_selector('.label-action.edit')
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue