From 34523d59a2562549c57c4d2253322da866469daa Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Mon, 11 Jul 2016 09:48:12 -0400 Subject: [PATCH] fix parseTypeChange params in Projects, Inventory Source, Job Templates extra vars fields, resolves #2866 (#2878) --- awx/ui/client/src/scheduler/schedulerAdd.controller.js | 4 ++-- awx/ui/client/src/scheduler/schedulerForm.partial.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js index 8f3ae65621..48dcbb764b 100644 --- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js +++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js @@ -78,11 +78,11 @@ export default ['$compile', '$filter', '$state', '$stateParams', 'AddSchedule', // extra_data field is not manifested in the UI when scheduling a Management Job if ($state.current.name === 'jobTemplateSchedules.add'){ $scope.parseType = 'yaml'; + // grab any existing extra_vars from parent job_template var defaultUrl = GetBasePath('job_templates') + $stateParams.id + '/'; Rest.setUrl(defaultUrl); Rest.get().then(function(res){ - // sanitize - var data = JSON.parse(JSON.stringify(res.data.extra_vars)); + var data = res.data.extra_vars; $scope.extraVars = data === '' ? '---' : data; ParseTypeChange({ scope: $scope, diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html index cd8c563b17..e3fffecec7 100644 --- a/awx/ui/client/src/scheduler/schedulerForm.partial.html +++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html @@ -630,8 +630,8 @@
- YAML - JSON + YAML + JSON