Tidy tooltip_title and fix for signed out user

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