From d83b67003f0e4b500ee6e2d055f1c2a336b7071d Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Thu, 30 Mar 2017 10:39:02 +0000
Subject: [PATCH] Hide issues and MRs in labels list if disabled
---
app/views/shared/_label.html.haml | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml
index bd994cdad01..d2f67097e66 100644
--- a/app/views/shared/_label.html.haml
+++ b/app/views/shared/_label.html.haml
@@ -11,12 +11,14 @@
= icon('caret-down')
.dropdown-menu.dropdown-menu-align-right
%ul
- %li
- = link_to_label(label, subject: subject, type: :merge_request) do
- view merge requests
- %li
- = link_to_label(label, subject: subject) do
- view open issues
+ - if !(defined?(@project) && label.is_a?(ProjectLabel) && !@project.merge_requests_enabled?)
+ %li
+ = link_to_label(label, subject: subject, type: :merge_request) do
+ view merge requests
+ - if !(defined?(@project) && label.is_a?(ProjectLabel) && !@project.issues_enabled?)
+ %li
+ = link_to_label(label, subject: subject) do
+ view open issues
- if current_user && defined?(@project)
%li.label-subscription
- if label.is_a?(ProjectLabel)
@@ -37,10 +39,12 @@
= link_to 'Delete', destroy_label_path(label), title: 'Delete', method: :delete, data: {confirm: 'Remove this label? Are you sure?'}
.pull-right.hidden-xs.hidden-sm.hidden-md
- = link_to_label(label, subject: subject, type: :merge_request, css_class: 'btn btn-transparent btn-action') do
- view merge requests
- = link_to_label(label, subject: subject, css_class: 'btn btn-transparent btn-action') do
- view open issues
+ - if !(defined?(@project) && label.is_a?(ProjectLabel) && !@project.merge_requests_enabled?)
+ = link_to_label(label, subject: subject, type: :merge_request, css_class: 'btn btn-transparent btn-action') do
+ view merge requests
+ - if !(defined?(@project) && label.is_a?(ProjectLabel) && !@project.issues_enabled?)
+ = link_to_label(label, subject: subject, css_class: 'btn btn-transparent btn-action') do
+ view open issues
- if current_user && defined?(@project)
.label-subscription.inline
@@ -82,4 +86,4 @@
new gl.ProjectLabelSubscription('##{dom_id(label)} .label-subscription');
- else
:javascript
- new gl.GroupLabelSubscription('##{dom_id(label)} .label-subscription');
+ new gl.GroupLabelSubscription('##{dom_id(label)} .label-subscription');
\ No newline at end of file
--
GitLab