kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '53816-empty-label-menu-if-not-logged-in' into 'master'

Browse source 
Resolve "Empty label menu if not logged in"

Closes #53816

See merge request gitlab-org/gitlab-ce!23042
This commit is contained in:
Rémy Coutable 2018-11-14 11:23:33 +00:00
commit c93439605b
2 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
app/views/shared/_label.html.haml
View file

@ -23,28 +23,29 @@
%li.inline %li.inline
= link_to edit_label_path(label), class: 'btn btn-transparent label-action edit has-tooltip', title: _('Edit'), data: { placement: 'bottom' }, aria_label: _('Edit') do = link_to edit_label_path(label), class: 'btn btn-transparent label-action edit has-tooltip', title: _('Edit'), data: { placement: 'bottom' }, aria_label: _('Edit') do
= sprite_icon('pencil') = sprite_icon('pencil')
%li.inline - if can?(current_user, :admin_label, label)
.dropdown %li.inline
%button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown label-action', data: { toggle: 'dropdown' }, aria_label: _('Label actions dropdown') } .dropdown
= sprite_icon('ellipsis_v') %button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown label-action', data: { toggle: 'dropdown' }, aria_label: _('Label actions dropdown') }
.dropdown-menu.dropdown-open-left = sprite_icon('ellipsis_v')
%ul .dropdown-menu.dropdown-open-left
- if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group) %ul
%li - if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
%button.js-promote-project-label-button.btn.btn-transparent.btn-action{ disabled: true, type: 'button', %li
data: { url: promote_project_label_path(label.project, label), %button.js-promote-project-label-button.btn.btn-transparent.btn-action{ disabled: true, type: 'button',
label_title: label.title, data: { url: promote_project_label_path(label.project, label),
label_color: label.color, label_title: label.title,
label_text_color: label.text_color, label_color: label.color,
group_name: label.project.group.name, label_text_color: label.text_color,
target: '#promote-label-modal', group_name: label.project.group.name,
container: 'body', target: '#promote-label-modal',
toggle: 'modal' } } container: 'body',
= _('Promote to group label') toggle: 'modal' } }
- if can?(current_user, :admin_label, 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)

5
changelogs/unreleased/53816-empty-label-menu-if-not-logged-in.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Removes promote to group label for anonymous user
merge_request: 23042
author: Jacopo Beschi @jacopo-beschi
type: fixed