Fixes from the cherry picks
Dieser Commit ist enthalten in:
Ursprung
f3c5eeb371
Commit
af93a67bb1
6 geänderte Dateien mit 6 neuen und 5 gelöschten Zeilen
|
@ -25,7 +25,7 @@ export default ComposerEditor.extend({
|
|||
lastValidatedAt: "lastValidatedAt",
|
||||
popupMenuOptions: [],
|
||||
draftStatus: "null",
|
||||
replyPlaceholder: alias("field.placeholder"),
|
||||
replyPlaceholder: alias("field.translatedPlaceholder"),
|
||||
uploadingFieldId: null,
|
||||
|
||||
@on("didInsertElement")
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
export default {
|
||||
run(_, container) {
|
||||
run(app, container) {
|
||||
const getToken = requirejs("wizard/lib/ajax").getToken;
|
||||
const isTesting = requirejs("discourse-common/config/environment")
|
||||
.isTesting;
|
||||
|
|
|
@ -57,6 +57,7 @@ CustomWizard.reopenClass({
|
|||
wizardJson.steps = wizardJson.steps
|
||||
.map((step) => {
|
||||
const stepObj = Step.create(step);
|
||||
stepObj.wizardId = wizardJson.id;
|
||||
|
||||
stepObj.fields.sort((a, b) => {
|
||||
return parseFloat(a.number) - parseFloat(b.number);
|
||||
|
|
|
@ -1 +1 @@
|
|||
{{input id=field.id value=field.value class=fieldClass placeholder=field.placeholder tabindex=field.tabindex autocomplete=autocomplete}}
|
||||
{{input id=field.id value=field.value class=fieldClass placeholder=field.translatedPlaceholder tabindex=field.tabindex autocomplete=autocomplete}}
|
||||
|
|
|
@ -1 +1 @@
|
|||
{{textarea id=field.id value=field.value class=fieldClass placeholder=field.placeholder tabindex=field.tabindex}}
|
||||
{{textarea id=field.id value=field.value class=fieldClass placeholder=field.translatedPlaceholder tabindex=field.tabindex}}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<label for={{field.id}} class="field-label">
|
||||
{{html-safe field.label}}
|
||||
{{html-safe field.translatedLabel}}
|
||||
</label>
|
||||
|
||||
{{#if field.image}}
|
||||
|
|
Laden …
In neuem Issue referenzieren