diff --git a/assets/javascripts/discourse/components/custom-wizard-no-access.js.es6 b/assets/javascripts/discourse/components/custom-wizard-no-access.js.es6 index 4a7f4889..13ec0611 100644 --- a/assets/javascripts/discourse/components/custom-wizard-no-access.js.es6 +++ b/assets/javascripts/discourse/components/custom-wizard-no-access.js.es6 @@ -36,6 +36,6 @@ export default Component.extend({ showLogin() { cookie("destination_url", getURL(`/w/${this.get("wizardId")}`)); getOwner(this).lookup("route:application").send("showLogin"); - } + }, }, }); diff --git a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 b/assets/javascripts/discourse/components/wizard-custom-action.js.es6 index 1f4c914a..b9329617 100644 --- a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 +++ b/assets/javascripts/discourse/components/wizard-custom-action.js.es6 @@ -5,7 +5,6 @@ import { computed } from "@ember/object"; import UndoChanges from "../mixins/undo-changes"; import Component from "@ember/component"; import I18n from "I18n"; -import { WIZARD_USER } from "./wizard-user-chooser"; export default Component.extend(UndoChanges, { componentType: "action", diff --git a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 index 5d67b8f7..cfa243e7 100644 --- a/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 +++ b/assets/javascripts/discourse/components/wizard-mapper-selector.js.es6 @@ -121,9 +121,13 @@ export default Component.extend({ guestGroup: computed("options.guestGroup", "inputType", function () { return this.optionEnabled("guestGroup"); }), - includeMessageableGroups: computed("options.includeMessageableGroups", "inputType", function () { - return this.optionEnabled("includeMessageableGroups"); - }), + includeMessageableGroups: computed( + "options.includeMessageableGroups", + "inputType", + function () { + return this.optionEnabled("includeMessageableGroups"); + } + ), userEnabled: computed("options.userSelection", "inputType", function () { return this.optionEnabled("userSelection"); }), @@ -358,10 +362,10 @@ export default Component.extend({ @discourseComputed("includeMessageableGroups", "options.userLimit") userOptions(includeMessageableGroups, userLimit) { const opts = { - includeMessageableGroups - } + includeMessageableGroups, + }; if (userLimit) { - opts.maximum = userLimit + opts.maximum = userLimit; } return opts; }, diff --git a/assets/javascripts/discourse/components/wizard-mapper.js.es6 b/assets/javascripts/discourse/components/wizard-mapper.js.es6 index 16e2e570..aad6a0e6 100644 --- a/assets/javascripts/discourse/components/wizard-mapper.js.es6 +++ b/assets/javascripts/discourse/components/wizard-mapper.js.es6 @@ -34,7 +34,7 @@ export default Component.extend({ context: options.context || null, guestGroup: options.guestGroup || false, includeMessageableGroups: options.includeMessageableGroups || false, - userLimit: options.userLimit || null + userLimit: options.userLimit || null, }; let inputTypes = ["key", "value", "output"]; diff --git a/assets/javascripts/discourse/components/wizard-user-chooser.js.es6 b/assets/javascripts/discourse/components/wizard-user-chooser.js.es6 index d52c733d..a177a1eb 100644 --- a/assets/javascripts/discourse/components/wizard-user-chooser.js.es6 +++ b/assets/javascripts/discourse/components/wizard-user-chooser.js.es6 @@ -1,4 +1,5 @@ import UserChooserComponent from "select-kit/components/user-chooser"; +import I18n from "I18n"; export const WIZARD_USER = "wizard-user"; @@ -14,7 +15,10 @@ export default UserChooserComponent.extend({ }, modifyNoSelection() { - return this.defaultItem(WIZARD_USER, I18n.t("admin.wizard.action.poster.wizard_user")); + return this.defaultItem( + WIZARD_USER, + I18n.t("admin.wizard.action.poster.wizard_user") + ); }, selectKitOptions: { @@ -28,7 +32,6 @@ export default UserChooserComponent.extend({ return; } return superPromise.then((results) => { - console.log(results) if (!results || results.length === 0) { return; } diff --git a/assets/javascripts/discourse/lib/wizard-schema.js.es6 b/assets/javascripts/discourse/lib/wizard-schema.js.es6 index 0c76fa53..01175ebb 100644 --- a/assets/javascripts/discourse/lib/wizard-schema.js.es6 +++ b/assets/javascripts/discourse/lib/wizard-schema.js.es6 @@ -100,7 +100,7 @@ const action = { custom_fields: null, skip_redirect: null, suppress_notifications: null, - poster: 'wizard-user', + poster: "wizard-user", guest_email: null, add_event: null, add_location: null, @@ -113,7 +113,7 @@ const action = { skip_redirect: null, custom_fields: null, required: null, - poster: 'wizard-user', + poster: "wizard-user", guest_email: null, recipient: null, suppress_notifications: null, diff --git a/assets/javascripts/discourse/templates/components/custom-wizard-no-access.hbs b/assets/javascripts/discourse/templates/components/custom-wizard-no-access.hbs index 5ba51a61..b1dba108 100644 --- a/assets/javascripts/discourse/templates/components/custom-wizard-no-access.hbs +++ b/assets/javascripts/discourse/templates/components/custom-wizard-no-access.hbs @@ -1,9 +1,6 @@
{{text}}
- + {{i18n "wizard.return_to_site" siteName=siteName}} {{#if showLoginButton}} diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs index 1116d79f..bbd0310a 100644 --- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs @@ -110,7 +110,7 @@ property="poster" onUpdate=(action "mappedFieldUpdated") options=(hash - textSelection='key,value' + textSelection="key,value" wizardFieldSelection=true userSelection="output" outputDefaultSelection="user"