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

Don't hide e-mail in settings behind email-in plugins

This commit is contained in:
Matt Palmer 2016-09-06 14:23:18 +10:00
parent 0fbb949af5
commit 51854e56ac
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/templates/group.hbs
View File

@ -94,10 +94,9 @@
</div>
{{#if siteSettings.email_in}}
{{#plugin-outlet "group-email-in"}}
<label for="incoming_email">{{i18n 'admin.groups.incoming_email'}}</label>
{{text-field name="incoming_email" value=model.incoming_email placeholderKey="admin.groups.incoming_email_placeholder"}}
{{/plugin-outlet}}
{{plugin-outlet "group-email-in"}}
{{/if}}
{{/unless}}

4
app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
View File

@ -20,7 +20,6 @@
</section>
{{#if emailInEnabled}}
{{#plugin-outlet "category-email-in"}}
<section class='field'>
<label>
{{input type="checkbox" checked=category.email_in_allow_strangers}}
@ -35,7 +34,8 @@
{{text-field class="email-in" value=category.email_in}}
</label>
</section>
{{/plugin-outlet}}
{{plugin-outlet "category-email-in"}}
{{/if}}
{{#if showPositionInput}}