SCHEDULES
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js
index 2663478a18..dbc2337357 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js
@@ -1,5 +1,3 @@
-import { N_ } from '../../../../../i18n';
-
export default {
name: "inventories.edit.inventory_sources.edit",
url: "/edit/:inventory_source_id",
diff --git a/awx/ui/client/src/scheduler/editSchedule.resolve.js b/awx/ui/client/src/scheduler/editSchedule.resolve.js
index 9d6e777896..f65dc17b9c 100644
--- a/awx/ui/client/src/scheduler/editSchedule.resolve.js
+++ b/awx/ui/client/src/scheduler/editSchedule.resolve.js
@@ -3,7 +3,6 @@ function editScheduleResolve () {
scheduleResolve: ['Rest', '$stateParams', 'GetBasePath', 'ProcessErrors',
(Rest, $stateParams, GetBasePath, ProcessErrors) => {
var path = `${GetBasePath('schedules')}${parseInt($stateParams.schedule_id)}/`;
- // const path = GetBasePath('schedules') + parseInt($stateParams.schedule_id) + '/');
Rest.setUrl(path);
return Rest.get()
.then(function(data) {
diff --git a/awx/ui/client/src/scheduler/schedulerList.controller.js b/awx/ui/client/src/scheduler/schedulerList.controller.js
index f7f21df662..e09566a797 100644
--- a/awx/ui/client/src/scheduler/schedulerList.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerList.controller.js
@@ -144,7 +144,7 @@ export default [
$scope.editSchedule = function(schedule) {
if ($state.is('jobs.schedules')){
- routeToScheduleForm(schedule, 'edit');
+ $state.go('jobs.schedules.edit', {schedule_id: schedule.id});
}
else {
if($state.current.name.endsWith('.add')) {
@@ -157,75 +157,6 @@ export default [
$state.go('.edit', { schedule_id: schedule.id });
}
}
-
- function buildStateMap(schedule){
-
- let deferred = $q.defer();
-
- switch(schedule.summary_fields.unified_job_template.unified_job_type){
- case 'job':
- deferred.resolve({
- name: 'templates.editJobTemplate.schedules.edit',
- params: {
- job_template_id: schedule.unified_job_template,
- schedule_id: schedule.id
- }
- });
- break;
-
- case 'workflow_job':
- deferred.resolve({
- name: 'templates.editWorkflowJobTemplate.schedules.edit',
- params: {
- workflow_job_template_id: schedule.unified_job_template,
- schedule_id: schedule.id
- }
- });
- break;
-
- case 'inventory_update':
- Rest.setUrl(schedule.related.unified_job_template);
- Rest.get().then( (res) => {
- deferred.resolve({
- name: 'inventories.edit.inventory_sources.edit.schedules.edit',
- params: {
- inventory_source_id: res.data.id,
- inventory_id: res.data.inventory,
- schedule_id: schedule.id,
- }
- });
- });
- break;
-
- case 'project_update':
- deferred.resolve({
- name: 'projects.edit.schedules.edit',
- params: {
- project_id: schedule.unified_job_template,
- schedule_id: schedule.id
- }
- });
- break;
-
- case 'system_job':
- deferred.resolve({
- name: 'managementJobsList.schedule.edit',
- params: {
- id: schedule.unified_job_template,
- schedule_id: schedule.id
- }
- });
- break;
- }
-
- return deferred.promise;
- }
-
- function routeToScheduleForm(schedule){
- buildStateMap(schedule).then((state) =>{
- $state.go(state.name, state.params);
- });
- }
};
$scope.toggleSchedule = function(event, id) {
diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js
index 00882ec03c..b1c89ac24e 100644
--- a/awx/ui/client/src/scheduler/schedules.route.js
+++ b/awx/ui/client/src/scheduler/schedules.route.js
@@ -285,7 +285,7 @@ const jobsSchedulesRoute = {
},
ncyBreadcrumb: {
parent: 'jobs',
- label: N_('SCHEDULED')
+ label: N_('SCHEDULES')
},
resolve: {
ScheduleList: ['ScheduledJobsList', function(list){
@@ -326,6 +326,22 @@ const jobsSchedulesRoute = {
}
};
+const jobsSchedulesEditRoute = {
+ name: 'jobs.schedules.edit',
+ route: '/:schedule_id',
+ ncyBreadcrumb: {
+ parent: 'jobs.schedules',
+ label: "{{breadcrumb.schedule_name}}"
+ },
+ views: {
+ 'scheduler@jobs': {
+ controller: 'schedulerEditController',
+ templateUrl: templateUrl("scheduler/schedulerForm"),
+ }
+ },
+ resolve: editScheduleResolve()
+};
+
export {
jobTemplatesSchedulesListRoute,
jobTemplatesSchedulesAddRoute,
@@ -336,5 +352,6 @@ export {
projectsSchedulesListRoute,
projectsSchedulesAddRoute,
projectsSchedulesEditRoute,
- jobsSchedulesRoute
+ jobsSchedulesRoute,
+ jobsSchedulesEditRoute
};