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

adds parentResolve for new route

Browse Source
This commit is contained in:
Jared Tabor 2018-05-14 18:34:07 -07:00
parent 8f3cc4ec3e
commit 5006b84eee
No known key found for this signature in database
GPG Key ID: 1B343EC4C3CF7E5C
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/scheduler/schedulerEdit.controller.js
View File

@ -231,7 +231,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
$scope.schedulerPurgeDays = Number(schedule.extra_data.days);
}
if ($state.current.name === 'templates.editJobTemplate.schedules.edit'){
if ($state.current.name === 'templates.editJobTemplate.schedules.edit' || $scope.parentObject.type === 'job_template'){
let jobTemplate = new JobTemplate();
@ -380,7 +380,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
}
}
});
} else if ($state.current.name === 'templates.editWorkflowJobTemplate.schedules.edit') {
} else if ($state.current.name === 'templates.editWorkflowJobTemplate.schedules.edit' || $scope.parentObject.type === 'workflow_job_template') {
let workflowJobTemplate = new WorkflowJobTemplate();
$q.all([workflowJobTemplate.optionsLaunch(ParentObject.id), workflowJobTemplate.getLaunch(ParentObject.id)])
@ -455,7 +455,9 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
if ($state.current.name !== 'managementJobsList.schedule.add' && $state.current.name !== 'managementJobsList.schedule.edit'){
if ($state.current.name === 'projects.edit.schedules.edit' ||
$state.current.name === 'inventories.edit.inventory_sources.edit.schedules.edit' ||
$state.current.name === 'templates.editWorkflowJobTemplate.schedules.add'
$state.current.name === 'templates.editWorkflowJobTemplate.schedules.add' ||
$scope.parentObject.type === 'inventory_source' ||
$scope.parentObject.type === 'project'
){
$scope.noVars = true;
} else {

14
awx/ui/client/src/scheduler/schedules.route.js
View File

@ -326,6 +326,18 @@ const jobsSchedulesRoute = {
}
};
// the /#/jobs/schedules/:schedule_id state needs to know about the type of
// resource is being scheduled.
const parentResolve = {
ParentObject: ['$stateParams', 'Rest', 'GetBasePath', 'scheduleResolve',
function($stateParams, Rest, GetBasePath, scheduleResolve){
let path = scheduleResolve.related.unified_job_template;
Rest.setUrl(path);
return Rest.get(path).then(response => response.data);
}
]
};
const jobsSchedulesEditRoute = {
name: 'jobs.schedules.edit',
route: '/:schedule_id',
@ -339,7 +351,7 @@ const jobsSchedulesEditRoute = {
templateUrl: templateUrl("scheduler/schedulerForm"),
}
},
resolve: editScheduleResolve()
resolve: _.merge(editScheduleResolve(), parentResolve)
};
export {