kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fe-fix-issuable-sidebar-icon-of-notification-disabled' into 'master' 

Fix issuable sidebar icon of notification disabled

See merge request gitlab-org/gitlab-ce!32134
This commit is contained in:
Mike Greiling 2019-08-23 22:01:11 +00:00
parent 4c8a656f7b 9ad0a8ad62
commit a93612aa5f
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/notifications_helper.rb
View File

@ -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

4
app/views/shared/issuable/_sidebar.html.haml
View File

@ -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

5
changelogs/unreleased/fe-fix-issuable-sidebar-icon-of-notification-disabled.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix issuable sidebar icon on notification disabled
merge_request: 32134
author:
type: fixed