diff --git a/awx/ui/client/src/inventory-scripts/edit/edit.route.js b/awx/ui/client/src/inventory-scripts/edit/edit.route.js index 2f0d9cf2e3..a8f3f2f015 100644 --- a/awx/ui/client/src/inventory-scripts/edit/edit.route.js +++ b/awx/ui/client/src/inventory-scripts/edit/edit.route.js @@ -16,17 +16,19 @@ export default { return FeaturesService.get(); }], inventory_script: - [ '$route', + [ '$state', + '$stateParams', '$q', 'Rest', 'GetBasePath', 'ProcessErrors', - function($route, $q, rest, getBasePath, ProcessErrors) { - if ($route.current.hasModelKey('inventory_script')) { - return $q.when($route.current.params.model.inventory_script); - } + function($state, $stateParams, $q, rest, getBasePath, ProcessErrors) { + // if ($stateParams.inventory_script) { + // $stateParams.inventory_script = JSON.parse($stateParams.inventory_script); + // return $q.when($stateParams.inventory_script); + // } - var inventoryScriptId = $route.current.params.inventory_script; + var inventoryScriptId = $stateParams.inventory_script; var url = getBasePath('inventory_scripts') + inventoryScriptId + '/'; rest.setUrl(url); diff --git a/awx/ui/client/src/inventory-scripts/list/list.controller.js b/awx/ui/client/src/inventory-scripts/list/list.controller.js index 029e9d4910..7dfe558b4b 100644 --- a/awx/ui/client/src/inventory-scripts/list/list.controller.js +++ b/awx/ui/client/src/inventory-scripts/list/list.controller.js @@ -38,7 +38,8 @@ export default scope.search(list.iterator); scope.editCustomInv = function(){ - $state.transitionTo('inventoryScriptsEdit', { + // this.inventory_script = JSON.stringify(this.inventory_script); + $state.go('inventoryScriptsEdit',{ inventory_script: this.inventory_script.id }); }; diff --git a/awx/ui/client/src/management-jobs/list/list.controller.js b/awx/ui/client/src/management-jobs/list/list.controller.js index a8d89a8519..a7e083697d 100644 --- a/awx/ui/client/src/management-jobs/list/list.controller.js +++ b/awx/ui/client/src/management-jobs/list/list.controller.js @@ -252,7 +252,7 @@ export default scope.configureSchedule = function() { $state.transitionTo('managementJobsSchedule', { - management_job: this.configure_job + management_job: this.configure_job.id }); }; diff --git a/awx/ui/client/src/management-jobs/schedule/schedule.route.js b/awx/ui/client/src/management-jobs/schedule/schedule.route.js index 526e7eddd2..eb2ec7a4ae 100644 --- a/awx/ui/client/src/management-jobs/schedule/schedule.route.js +++ b/awx/ui/client/src/management-jobs/schedule/schedule.route.js @@ -16,17 +16,17 @@ export default { return FeaturesService.get(); }], management_job: - [ '$route', + [ '$stateParams', '$q', 'Rest', 'GetBasePath', 'ProcessErrors', - function($route, $q, rest, getBasePath, ProcessErrors) { - if ($route.current.hasModelKey('management_job')) { - return $q.when($route.current.params.model.management_job); - } + function($stateParams, $q, rest, getBasePath, ProcessErrors) { + // if ($route.current.hasModelKey('management_job')) { + // return $q.when($route.current.params.model.management_job); + // } - var managementJobId = $route.current.params.management_job; + var managementJobId = $stateParams.management_job; var url = getBasePath('system_job_templates') + managementJobId + '/'; rest.setUrl(url);