From 429cf40db35bea75078ec58327812627faa9afe5 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 16 Jul 2018 18:02:11 -0700 Subject: [PATCH] Adjusts which partical/controller combination is used when editing a schedule MGMT jobs require a different partial + controller --- .../client/src/scheduler/schedules.route.js | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js index ce0b26787d..49d65cd950 100644 --- a/awx/ui/client/src/scheduler/schedules.route.js +++ b/awx/ui/client/src/scheduler/schedules.route.js @@ -345,9 +345,26 @@ const jobsSchedulesEditRoute = { label: "{{breadcrumb.schedule_name}}" }, views: { - 'form': { - controller: 'schedulerEditController', - templateUrl: templateUrl("scheduler/schedulerForm"), + 'form':{ + templateProvider: function(ParentObject, Rest){ + let path; + if(ParentObject.type === 'system_job_template'){ + path = templateUrl('management-jobs/scheduler/schedulerForm'); + } + else { + path = templateUrl('scheduler/schedulerForm'); + } + Rest.setUrl(path); + return Rest.get(path).then(response => response.data); + }, + controllerProvider: function(ParentObject){ + if (ParentObject.type === 'system_job_template') { + return 'managementJobEditController'; + } + else { + return 'schedulerEditController'; + } + } } }, resolve: _.merge(editScheduleResolve(), parentResolve)