diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-22 21:39:34 -0500 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2019-08-23 14:46:03 -0500 |
| commit | 9ad0a8ad6259fb44876443d8bbf692e291165376 (patch) | |
| tree | b8cdda1326409d997fcafac3783d8f1dd9c71ccd | |
| parent | ef0f1509dd2a2a3ba5798362e2be21108b705a85 (diff) | |
| download | gitlab-ce-9ad0a8ad6259fb44876443d8bbf692e291165376.tar.gz | |
Fix issuable sidebar icon of notification disabled
by adding the proper notification icon
| -rw-r--r-- | app/helpers/notifications_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index 5678304ffcf..8855e0cdd70 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -106,9 +106,9 @@ module NotificationsHelper end end - def notification_setting_icon(notification_setting) + def notification_setting_icon(notification_setting = nil) sprite_icon( - notification_setting.disabled? ? "notifications-off" : "notifications", + !notification_setting.present? || notification_setting.disabled? ? "notifications-off" : "notifications", css_class: "icon notifications-icon js-notifications-icon" ) end diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 825088a58e7..245886f495c 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -139,7 +139,9 @@ - if signed_in - if issuable_sidebar[:project_emails_disabled] .block.js-emails-disabled - = notification_description(:owner_disabled) + .sidebar-collapsed-icon.has-tooltip{ title: notification_description(:owner_disabled), data: { placement: "left", container: "body", boundary: 'viewport' } } + = notification_setting_icon + .hide-collapsed= notification_description(:owner_disabled) - else .js-sidebar-subscriptions-entry-point diff --git a/changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml b/changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml new file mode 100644 index 00000000000..736e12ff694 --- /dev/null +++ b/changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml @@ -0,0 +1,5 @@ +--- +title: Fix issuable sidebar icon on notification disabled +merge_request: 32134 +author: +type: fixed |