mirror of
https://github.com/discourse/discourse.git
synced 2025-03-27 09:45:43 +08:00
FIX: if the email template has multiple subjects, link to customize text page
This commit is contained in:
parent
222fd00724
commit
86374c90de
app
assets/javascripts/admin
serializers
config/locales
@ -4,6 +4,15 @@ import { bufferedProperty } from 'discourse/mixins/buffered-content';
|
|||||||
export default Ember.Controller.extend(bufferedProperty('emailTemplate'), {
|
export default Ember.Controller.extend(bufferedProperty('emailTemplate'), {
|
||||||
saved: false,
|
saved: false,
|
||||||
|
|
||||||
|
hasMultipleSubjects: function() {
|
||||||
|
const buffered = this.get('buffered');
|
||||||
|
if (buffered.getProperties('subject')['subject']) {
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
return buffered.getProperties('id')['id'];
|
||||||
|
}
|
||||||
|
}.property("buffered"),
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
saveChanges() {
|
saveChanges() {
|
||||||
const buffered = this.get('buffered');
|
const buffered = this.get('buffered');
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
<div class='email-template'>
|
<div class='email-template'>
|
||||||
<label>
|
<label>{{i18n "admin.customize.email_templates.subject"}}</label>
|
||||||
{{i18n "admin.customize.email_templates.subject"}}
|
{{#if hasMultipleSubjects}}
|
||||||
|
<h3>{{#link-to 'adminSiteText' (query-params q=hasMultipleSubjects)}}{{i18n "admin.customize.email_templates.multiple_subjects"}}{{/link-to}}</h3>
|
||||||
|
{{else}}
|
||||||
{{input value=buffered.subject}}
|
{{input value=buffered.subject}}
|
||||||
</label>
|
{{/if}}
|
||||||
|
<br>
|
||||||
|
|
||||||
<label>{{i18n "admin.customize.email_templates.body"}}</label>
|
<label>{{i18n "admin.customize.email_templates.body"}}</label>
|
||||||
{{d-editor value=buffered.body}}
|
{{d-editor value=buffered.body}}
|
||||||
|
@ -10,7 +10,11 @@ class AdminEmailTemplateSerializer < ApplicationSerializer
|
|||||||
end
|
end
|
||||||
|
|
||||||
def subject
|
def subject
|
||||||
@subject ||= I18n.t("#{object}.subject_template")
|
if I18n.exists?("#{object}.subject_template.other")
|
||||||
|
@subject = nil
|
||||||
|
else
|
||||||
|
@subject ||= I18n.t("#{object}.subject_template")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def body
|
def body
|
||||||
|
@ -2093,6 +2093,7 @@ en:
|
|||||||
email_templates:
|
email_templates:
|
||||||
title: "Email Templates"
|
title: "Email Templates"
|
||||||
subject: "Subject"
|
subject: "Subject"
|
||||||
|
multiple_subjects: "This email template has multiple subjects."
|
||||||
body: "Body"
|
body: "Body"
|
||||||
none_selected: "Select an email template to begin editing."
|
none_selected: "Select an email template to begin editing."
|
||||||
revert: "Revert Changes"
|
revert: "Revert Changes"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user