diff --git a/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6 index bfe90f72..b405cf95 100644 --- a/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6 +++ b/assets/javascripts/discourse/routes/admin-wizards-api-show.js.es6 @@ -1,7 +1,10 @@ import CustomWizardApi from "../models/custom-wizard-api"; import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from '@ember/service'; export default DiscourseRoute.extend({ + router: service(), + model(params) { if (params.name === "create") { return CustomWizardApi.create({ isNew: true }); @@ -12,7 +15,7 @@ export default DiscourseRoute.extend({ afterModel(model) { if (model === null) { - return this.transitionTo("adminWizardsApi"); + return this.router.transitionTo("adminWizardsApi"); } }, diff --git a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 index 541ab028..e96160a6 100644 --- a/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 +++ b/assets/javascripts/discourse/routes/admin-wizards-api.js.es6 @@ -1,7 +1,10 @@ import DiscourseRoute from "discourse/routes/discourse"; import CustomWizardApi from "../models/custom-wizard-api"; +import { inject as service } from '@ember/service'; export default DiscourseRoute.extend({ + router: service(), + model() { return CustomWizardApi.list(); }, @@ -25,11 +28,11 @@ export default DiscourseRoute.extend({ actions: { changeApi(apiName) { this.controllerFor("adminWizardsApi").set("apiName", apiName); - this.transitionTo("adminWizardsApiShow", apiName); + this.router.transitionTo("adminWizardsApiShow", apiName); }, afterDestroy() { - this.transitionTo("adminWizardsApi").then(() => this.refresh()); + this.router.transitionTo("adminWizardsApi").then(() => this.refresh()); }, afterSave(apiName) { @@ -38,7 +41,7 @@ export default DiscourseRoute.extend({ createApi() { this.controllerFor("adminWizardsApi").set("apiName", "create"); - this.transitionTo("adminWizardsApiShow", "create"); + this.router.transitionTo("adminWizardsApiShow", "create"); }, }, }); diff --git a/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6 index e1f53c8f..497f66cf 100644 --- a/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6 +++ b/assets/javascripts/discourse/routes/admin-wizards-logs-show.js.es6 @@ -1,15 +1,18 @@ import CustomWizardLogs from "../models/custom-wizard-logs"; import DiscourseRoute from "discourse/routes/discourse"; import { A } from "@ember/array"; +import { inject as service } from '@ember/service'; export default DiscourseRoute.extend({ + router: service(), + model(params) { return CustomWizardLogs.list(params.wizardId); }, afterModel(model) { if (model === null) { - return this.transitionTo("adminWizardsLogs"); + return this.router.transitionTo("adminWizardsLogs"); } }, diff --git a/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6 index a1575050..414dc87c 100644 --- a/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6 +++ b/assets/javascripts/discourse/routes/admin-wizards-logs.js.es6 @@ -1,7 +1,10 @@ import DiscourseRoute from "discourse/routes/discourse"; import { ajax } from "discourse/lib/ajax"; +import { inject as service } from '@ember/service'; export default DiscourseRoute.extend({ + router: service(), + model() { return ajax(`/admin/wizards/wizard`); }, @@ -18,7 +21,7 @@ export default DiscourseRoute.extend({ actions: { changeWizard(wizardId) { this.controllerFor("adminWizardsLogs").set("wizardId", wizardId); - this.transitionTo("adminWizardsLogsShow", wizardId); + this.router.transitionTo("adminWizardsLogsShow", wizardId); }, }, }); diff --git a/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6 index b9dbd90f..4f267b49 100644 --- a/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6 +++ b/assets/javascripts/discourse/routes/admin-wizards-submissions-show.js.es6 @@ -2,15 +2,18 @@ import { A } from "@ember/array"; import CustomWizardAdmin from "../models/custom-wizard-admin"; import DiscourseRoute from "discourse/routes/discourse"; import { formatModel } from "../lib/wizard-submission"; +import { inject as service } from '@ember/service'; export default DiscourseRoute.extend({ + router: service(), + model(params) { return CustomWizardAdmin.submissions(params.wizardId); }, afterModel(model) { if (model === null) { - return this.transitionTo("adminWizardsSubmissions"); + return this.router.transitionTo("adminWizardsSubmissions"); } }, diff --git a/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6 index 9ecb183d..3229bd8c 100644 --- a/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6 +++ b/assets/javascripts/discourse/routes/admin-wizards-submissions.js.es6 @@ -1,7 +1,10 @@ import DiscourseRoute from "discourse/routes/discourse"; import { ajax } from "discourse/lib/ajax"; +import { inject as service } from '@ember/service'; export default DiscourseRoute.extend({ + router: service(), + model() { return ajax(`/admin/wizards/wizard`); }, @@ -18,7 +21,7 @@ export default DiscourseRoute.extend({ actions: { changeWizard(wizardId) { this.controllerFor("adminWizardsSubmissions").set("wizardId", wizardId); - this.transitionTo("adminWizardsSubmissionsShow", wizardId); + this.router.transitionTo("adminWizardsSubmissionsShow", wizardId); }, }, }); diff --git a/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6 index f55ff19e..2dde4788 100644 --- a/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6 +++ b/assets/javascripts/discourse/routes/admin-wizards-wizard-show.js.es6 @@ -2,8 +2,11 @@ import CustomWizardAdmin from "../models/custom-wizard-admin"; import { ajax } from "discourse/lib/ajax"; import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; +import { inject as service } from '@ember/service'; export default DiscourseRoute.extend({ + router: service(), + model(params) { if (params.wizardId === "create") { return { create: true }; @@ -14,7 +17,7 @@ export default DiscourseRoute.extend({ afterModel(model) { if (model.none) { - return this.transitionTo("adminWizardsWizard"); + return this.router.transitionTo("adminWizardsWizard"); } }, diff --git a/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6 b/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6 index b23b63f6..6c984b48 100644 --- a/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6 +++ b/assets/javascripts/discourse/routes/admin-wizards-wizard.js.es6 @@ -4,8 +4,11 @@ import EmberObject, { set } from "@ember/object"; import { A } from "@ember/array"; import { all } from "rsvp"; import { ajax } from "discourse/lib/ajax"; +import { inject as service } from '@ember/service'; export default DiscourseRoute.extend({ + router: service(), + model() { return ajax("/admin/wizards/wizard"); }, @@ -80,14 +83,14 @@ export default DiscourseRoute.extend({ this.controllerFor("adminWizardsWizard").set("wizardId", wizardId); if (wizardId) { - this.transitionTo("adminWizardsWizardShow", wizardId); + this.router.transitionTo("adminWizardsWizardShow", wizardId); } else { - this.transitionTo("adminWizardsWizard"); + this.router.transitionTo("adminWizardsWizard"); } }, afterDestroy() { - this.transitionTo("adminWizardsWizard").then(() => this.refresh()); + this.router.transitionTo("adminWizardsWizard").then(() => this.refresh()); }, afterSave(wizardId) { @@ -96,7 +99,7 @@ export default DiscourseRoute.extend({ createWizard() { this.controllerFor("adminWizardsWizard").set("wizardId", "create"); - this.transitionTo("adminWizardsWizardShow", "create"); + this.router.transitionTo("adminWizardsWizardShow", "create"); }, }, }); diff --git a/assets/javascripts/discourse/routes/admin-wizards.js.es6 b/assets/javascripts/discourse/routes/admin-wizards.js.es6 index 1fa786d3..b29fccec 100644 --- a/assets/javascripts/discourse/routes/admin-wizards.js.es6 +++ b/assets/javascripts/discourse/routes/admin-wizards.js.es6 @@ -1,7 +1,10 @@ import DiscourseRoute from "discourse/routes/discourse"; import { ajax } from "discourse/lib/ajax"; +import { inject as service } from '@ember/service'; export default DiscourseRoute.extend({ + router: service(), + model() { return ajax("/admin/wizards"); }, @@ -17,7 +20,7 @@ export default DiscourseRoute.extend({ afterModel(model, transition) { if (transition.targetName === "adminWizards.index") { - this.transitionTo("adminWizardsWizard"); + this.router.transitionTo("adminWizardsWizard"); } }, }); diff --git a/assets/javascripts/discourse/routes/custom-wizard-step.js.es6 b/assets/javascripts/discourse/routes/custom-wizard-step.js.es6 index c7ba1cf6..1ad41fbf 100644 --- a/assets/javascripts/discourse/routes/custom-wizard-step.js.es6 +++ b/assets/javascripts/discourse/routes/custom-wizard-step.js.es6 @@ -30,7 +30,7 @@ export default Route.extend({ afterModel(model) { if (model.completed) { - return this.transitionTo("wizard.index"); + return this.router.transitionTo("wizard.index"); } return model.set("wizardId", this.wizard.id); },