External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 02:50:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

few remaining routes to fixup

Browse Source
This commit is contained in:
Jared Tabor 2015-12-23 10:44:50 -08:00
parent 7951d26025
commit 7a75f6d12a
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui/client/src/inventory-scripts/edit/edit.route.js
View File

@ -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);

3
awx/ui/client/src/inventory-scripts/list/list.controller.js
View File

@ -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
});
};

2
awx/ui/client/src/management-jobs/list/list.controller.js
View File

@ -252,7 +252,7 @@ export default
scope.configureSchedule = function() {
$state.transitionTo('managementJobsSchedule', {
management_job: this.configure_job
management_job: this.configure_job.id
});
};

12
awx/ui/client/src/management-jobs/schedule/schedule.route.js
View File

@ -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);