From 586ce69b1b9b9db765c0e9d961eae430697d02f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 10 Oct 2016 16:36:36 +0200
Subject: [PATCH] UX: properly hide 'Activity Summary' preference when
 Summaries are disabled

---
 .../discourse/controllers/preferences.js.es6           |  5 -----
 .../discourse/templates/user/preferences.hbs           | 10 +++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index 98e0b05f7ce..068825d4cff 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -59,11 +59,6 @@ export default Ember.Controller.extend(CanCheckEmails, {
     return !this.siteSettings.enable_sso && this.siteSettings.enable_local_logins;
   },
 
-  @computed()
-  canReceiveDigest() {
-    return !this.siteSettings.disable_digest_emails;
-  },
-
   @computed()
   availableLocales() {
     return this.siteSettings.available_locales.split('|').map(s => ({ name: s, value: s }));
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index 96c061cfb31..7d824185185 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -189,9 +189,9 @@
       {{/unless}}
     </div>
 
-    <div class='control-group pref-activity-summary'>
-      <label class="control-label">{{i18n 'user.email_activity_summary'}}</label>
-      {{#if canReceiveDigest}}
+    {{#unless siteSettings.disable_digest_emails}}
+      <div class='control-group pref-activity-summary'>
+        <label class="control-label">{{i18n 'user.email_activity_summary'}}</label>
         {{preference-checkbox labelKey="user.email_digests.title" disabled=model.user_option.mailing_list_mode checked=model.user_option.email_digests}}
         {{#if model.user_option.email_digests}}
           <div class='controls controls-dropdown'>
@@ -199,8 +199,8 @@
           </div>
           {{preference-checkbox labelKey="user.include_tl0_in_digests" disabled=model.user_option.mailing_list_mode checked=model.user_option.include_tl0_in_digests}}
         {{/if}}
-      {{/if}}
-    </div>
+      </div>
+    {{/unless}}
 
     {{#unless siteSettings.disable_mailing_list_mode}}
       <div class='control-group pref-mailing-list-mode'>