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

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
commit bce7f0678f

View File

@ -110,7 +110,12 @@ export default [
};
$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) {
@ -118,7 +123,15 @@ export default [
routeToScheduleForm(schedule, 'edit');
}
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){