From 8bd4c11f53c34f2541ae346981c7d30542bf7b83 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 8 Jun 2018 11:08:55 +0530 Subject: [PATCH] FIX: do not show email disabled notice to staff when they can receive emails --- .../javascripts/discourse/components/global-notice.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6 index c8479c462df..09d96502eea 100644 --- a/app/assets/javascripts/discourse/components/global-notice.js.es6 +++ b/app/assets/javascripts/discourse/components/global-notice.js.es6 @@ -22,7 +22,7 @@ export default Ember.Component.extend(bufferedRender({ notices.push([I18n.t("read_only_mode.enabled"), 'alert-read-only']); } - if (this.siteSettings.disable_emails === "yes" || this.siteSettings.disable_emails === "non-staff") { + if (this.siteSettings.disable_emails === "yes" || (this.siteSettings.disable_emails === "non-staff" && !(this.currentUser && this.currentUser.get('staff')))) { notices.push([I18n.t("emails_are_disabled"), 'alert-emails-disabled']); }