diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-01 00:04:19 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-17 15:10:13 -0200 |
| commit | 48d851d2015c3cb901498455862176eb15be3a0f (patch) | |
| tree | 8408a28dc911b16a190ace1e1005a6cc4faf2104 | |
| parent | d45c6eca2750abd5614be41a6fe01033f655ef1e (diff) | |
| download | gitlab-ce-48d851d2015c3cb901498455862176eb15be3a0f.tar.gz | |
Refactoring label subscription toggle button text to accept a project
| -rw-r--r-- | app/helpers/labels_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/shared/_label.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index e1db6007c09..74f6f1b1478 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -155,10 +155,10 @@ module LabelsHelper end end - def label_subscription_toggle_button_text(label) + def label_subscription_toggle_button_text(label, project) case label when GroupLabel then 'Subscribing to group labels is currently not supported.' - when ProjectLabel then label.subscribed?(current_user) ? 'Unsubscribe' : 'Subscribe' + when ProjectLabel then label.subscribed?(current_user, project) ? 'Unsubscribe' : 'Subscribe' end end diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index b985ce4884e..f3c49870770 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -20,8 +20,8 @@ = pluralize open_issues_count, 'open issue' - if current_user %li.label-subscription{ data: toggle_subscription_data(label) } - %span= label_subscription_toggle_button_text(label) %a.js-subscribe-button.label-subscribe-button.subscription-status{ role: "button", href: "#", data: { toggle: "tooltip", status: label_subscription_status(label, @project) } } + %span= label_subscription_toggle_button_text(label, @project) - if can?(current_user, :admin_label, label) %li = link_to 'Edit', edit_label_path(label) @@ -36,8 +36,8 @@ - if current_user .label-subscription.inline{ data: toggle_subscription_data(label) } - %span.sr-only= label_subscription_toggle_button_text(label) %button.js-subscribe-button.label-subscribe-button.btn.btn-transparent.btn-action.subscription-status{ type: "button", title: label_subscription_toggle_button_text(label, @project), data: { toggle: "tooltip", status: label_subscription_status(label, @project) } } + %span.sr-only= label_subscription_toggle_button_text(label, @project) = icon('eye', class: 'label-subscribe-button-icon', disabled: label.is_a?(GroupLabel)) = icon('spinner spin', class: 'label-subscribe-button-loading') |