mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FEATURE: mailing list mode always available
This commit is contained in:
@@ -103,12 +103,6 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label">{{i18n user.email_settings}}</label>
|
||||
<div class="controls">
|
||||
{{#if Discourse.SiteSettings.enable_mailing_list_mode}}
|
||||
<label class="checkbox-label">
|
||||
{{view Ember.Checkbox checkedBinding="mailing_list_mode"}}
|
||||
{{i18n user.mailing_list_mode}}
|
||||
</label>
|
||||
{{/if}}
|
||||
|
||||
<label class="checkbox-label">{{view Ember.Checkbox checkedBinding="email_digests"}}
|
||||
{{i18n user.email_digests.title}}</label>
|
||||
@@ -120,8 +114,12 @@
|
||||
{{/if}}
|
||||
<label class="checkbox-label">{{view Ember.Checkbox checkedBinding="email_private_messages"}}
|
||||
{{i18n user.email_private_messages}}</label>
|
||||
|
||||
<label class="checkbox-label">{{view Ember.Checkbox checkedBinding="email_direct"}}
|
||||
{{i18n user.email_direct}}</label>
|
||||
<label class="checkbox-label">
|
||||
{{view Ember.Checkbox checkedBinding="mailing_list_mode"}}
|
||||
{{i18n user.mailing_list_mode}}</label>
|
||||
<label class="checkbox-label">{{view Ember.Checkbox checkedBinding="email_always"}}
|
||||
{{i18n user.email_always}}</label>
|
||||
</div>
|
||||
|
||||
@@ -141,8 +141,7 @@ class UserNotifications < ActionMailer::Base
|
||||
username = @notification.data_hash[:original_username]
|
||||
notification_type = opts[:notification_type] || Notification.types[@notification.notification_type].to_s
|
||||
|
||||
return if SiteSetting.enable_mailing_list_mode &&
|
||||
user.mailing_list_mode &&
|
||||
return if user.mailing_list_mode &&
|
||||
["replied", "mentioned", "quoted", "posted"].include?(notification_type)
|
||||
|
||||
title = @notification.data_hash[:topic_title]
|
||||
|
||||
Reference in New Issue
Block a user