IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: properly hide 'Activity Summary' preference when Summaries are disabled

Browse Source
This commit is contained in:
Régis Hanol
2016-10-10 16:36:36 +02:00
parent 8f68a95e56
commit 586ce69b1b
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/controllers/preferences.js.es6
View File

@@ -59,11 +59,6 @@ export default Ember.Controller.extend(CanCheckEmails, {
return !this.siteSettings.enable_sso && this.siteSettings.enable_local_logins; return !this.siteSettings.enable_sso && this.siteSettings.enable_local_logins;
}, },
@computed()
canReceiveDigest() {
return !this.siteSettings.disable_digest_emails;
},
@computed() @computed()
availableLocales() { availableLocales() {
return this.siteSettings.available_locales.split('|').map(s => ({ name: s, value: s })); return this.siteSettings.available_locales.split('|').map(s => ({ name: s, value: s }));

4
app/assets/javascripts/discourse/templates/user/preferences.hbs
View File

@@ -189,9 +189,9 @@
{{/unless}} {{/unless}}
</div> </div>
{{#unless siteSettings.disable_digest_emails}}
<div class='control-group pref-activity-summary'> <div class='control-group pref-activity-summary'>
<label class="control-label">{{i18n 'user.email_activity_summary'}}</label> <label class="control-label">{{i18n 'user.email_activity_summary'}}</label>
{{#if canReceiveDigest}}
{{preference-checkbox labelKey="user.email_digests.title" disabled=model.user_option.mailing_list_mode checked=model.user_option.email_digests}} {{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}} {{#if model.user_option.email_digests}}
<div class='controls controls-dropdown'> <div class='controls controls-dropdown'>
@@ -199,8 +199,8 @@
</div> </div>
{{preference-checkbox labelKey="user.include_tl0_in_digests" disabled=model.user_option.mailing_list_mode checked=model.user_option.include_tl0_in_digests}} {{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}}
{{/if}}
</div> </div>
{{/unless}}
{{#unless siteSettings.disable_mailing_list_mode}} {{#unless siteSettings.disable_mailing_list_mode}}
<div class='control-group pref-mailing-list-mode'> <div class='control-group pref-mailing-list-mode'>