Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Move allow_unknown_sender_topic_replies outside SMTP/IMAP box (#13410) 

This setting applies to both SMTP and IMAP for the group inbox,
so it should be outside those boxes in a standalone setting.
This commit is contained in:
Martin Brennan 2021-06-17 11:40:01 +10:00 committed by GitHub
parent b673272221
commit a2d69ff479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
View File

@ -70,15 +70,6 @@
{{/if}}
</div>
<div class="control-group">
<h3>{{i18n "groups.manage.email.imap_additional_settings"}}</h3>
<label class="control-group-inline" for="allow_unknown_sender_topic_replies">
{{input type="checkbox" name="allow_unknown_sender_topic_replies" id="allow_unknown_sender_topic_replies" checked=group.allow_unknown_sender_topic_replies tabindex="13"}}
<span>{{i18n "groups.manage.email.settings.allow_unknown_sender_topic_replies"}}</span>
</label>
<p>{{i18n "groups.manage.email.settings.allow_unknown_sender_topic_replies_hint"}}</p>
</div>
{{#if group.imap_updated_at}}
<div class="group-email-last-updated-details for-imap">
<small>

11
app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
View File

@ -33,6 +33,17 @@
</div>
{{/if}}
<div class="group-manage-email-additional-settings-wrapper">
<div class="control-group">
<h3>{{i18n "groups.manage.email.imap_additional_settings"}}</h3>
<label class="control-group-inline" for="allow_unknown_sender_topic_replies">
{{input type="checkbox" name="allow_unknown_sender_topic_replies" id="allow_unknown_sender_topic_replies" checked=group.allow_unknown_sender_topic_replies tabindex="13"}}
<span>{{i18n "groups.manage.email.settings.allow_unknown_sender_topic_replies"}}</span>
</label>
<p>{{i18n "groups.manage.email.settings.allow_unknown_sender_topic_replies_hint"}}</p>
</div>
</div>
<br>
{{group-manage-save-button model=group disabled=(not emailSettingsValid) beforeSave=beforeSave afterSave=afterSave tabindex="14"}}
</div>

4
app/assets/stylesheets/common/base/group.scss
View File

@ -265,3 +265,7 @@ table.group-category-permissions {
}
}
}
.group-manage-email-additional-settings-wrapper {
margin-top: 1em;
}

2
config/locales/client.en.yml
View File

@ -734,7 +734,7 @@ en:
settings:
title: "Settings"
allow_unknown_sender_topic_replies: "Allow unknown sender topic replies."
allow_unknown_sender_topic_replies_hint: "Allows unknown senders to reply to group topics. If this is not enabled, replies from email addresses not already included on the IMAP email thread or invited to the topic will create a new topic."
allow_unknown_sender_topic_replies_hint: "Allows unknown senders to reply to group topics. If this is not enabled, replies from email addresses not already invited to the topic will create a new topic."
mailboxes:
synchronized: "Synchronized Mailbox"
none_found: "No mailboxes were found in this email account."