summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2018-05-29 10:25:45 +0100
committerLuke Bennett <lukeeeebennettplus@gmail.com>2018-05-29 10:25:45 +0100
commit5e5828a41a95e06e7aa66368efbd296846aa1e8b (patch)
tree6616e77deb6881d3572161d80369938321794d8e /app
parentc9e4c1760dae5e1916bb5ad22f260b7fd0b58475 (diff)
downloadgitlab-ce-5e5828a41a95e06e7aa66368efbd296846aa1e8b.tar.gz
Tidy tooltip_title and fix for signed out user
Diffstat (limited to 'app')
-rw-r--r--app/helpers/labels_helper.rb10
-rw-r--r--app/views/shared/_label.html.haml2
2 files changed, 11 insertions, 1 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index e1b0e7a4a3e..7fddf74c654 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -211,6 +211,16 @@ module LabelsHelper
end
end
+ def label_status_tooltip(status)
+ return '' unless status
+
+ if status.unsubscribed?
+ "Subscribe at #{label.is_a?(ProjectLabel) ? 'project' : 'group'} level"
+ else
+ "Unsubscribe at #{status.sub('-', ' ')}"
+ end
+ end
+
# Required for Banzai::Filter::LabelReferenceFilter
module_function :render_colored_label, :text_color_for_bg, :escape_once
end
diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml
index fae264ef3cc..d8ab63e053c 100644
--- a/app/views/shared/_label.html.haml
+++ b/app/views/shared/_label.html.haml
@@ -6,7 +6,7 @@
- toggle_subscription_path = toggle_subscription_label_path(label, @project) if current_user
- show_label_merge_requests_link = show_label_issuables_link?(label, :merge_requests, project: @project)
- show_label_issues_link = show_label_issuables_link?(label, :issues, project: @project)
-- tooltip_title = status.unsubscribed? ? "Subscribe at #{label.is_a?(ProjectLabel) ? 'project' : 'group'} level" : "Unsubscribe at #{status.sub('-', ' ')}"
+- tooltip_title = label_status_tooltip(status)
%li.label-list-item{ id: label_css_id, data: { id: label.id } }
= render "shared/label_row", label: label, subject: subject, force_priority: force_priority