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

Merge pull request #5668 from mabashian/5611-add-edit-schedule

Browse Source 
Properly route add/edit schedules based on the current state
This commit is contained in:
Michael Abashian
2017-03-09 13:25:44 -05:00
committed by GitHub
parent 3a95c34a04 bd6b010af0
commit bce7f0678f
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/ui/client/src/scheduler/schedulerList.controller.js
View File

@@ -110,7 +110,12 @@ export default [
}; };
$scope.addSchedule = function() { $scope.addSchedule = function() {
$state.go('.add'); if($state.current.name.endsWith('.edit')) {
$state.go('^.add');
}
else if(!$state.current.name.endsWith('.add')) {
$state.go('.add');
}
}; };
$scope.editSchedule = function(schedule) { $scope.editSchedule = function(schedule) {
@@ -118,7 +123,15 @@ export default [
routeToScheduleForm(schedule, 'edit'); routeToScheduleForm(schedule, 'edit');
} }
else { else {
$state.go('.edit', { schedule_id: schedule.id }); if($state.current.name.endsWith('.add')) {
$state.go('^.edit', { schedule_id: schedule.id });
}
else if($state.current.name.endsWith('.edit')) {
$state.go('.', { schedule_id: schedule.id });
}
else {
$state.go('.edit', { schedule_id: schedule.id });
}
} }
function buildStateMap(schedule){ function buildStateMap(schedule){