codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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> </div>
{{#if siteSettings.email_in}} {{#if siteSettings.email_in}}
{{#plugin-outlet "group-email-in"}}
<label for="incoming_email">{{i18n 'admin.groups.incoming_email'}}</label> <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"}} {{text-field name="incoming_email" value=model.incoming_email placeholderKey="admin.groups.incoming_email_placeholder"}}
{{/plugin-outlet}} {{plugin-outlet "group-email-in"}}
{{/if}} {{/if}}
{{/unless}} {{/unless}}

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

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