From ea8a537906d954b90962e579e7cdc5889d328b85 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 19 Feb 2015 11:04:39 -0500 Subject: [PATCH] Job Submission extra vars When submitting a job to launch, the UI will collect extra_vars from the the JT. However with a recent change to make extra_vars include comments, the UI no longer receives the JT extra vars as a JSON obj, but rather as a yaml-unparsed string. So I am changing the way we parse these JT-extra_vars from 'json' to 'yaml' since we no longer expect to recieve a json-ified extra var object. --- awx/ui/static/js/helpers/JobSubmission.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js index cb0d3b8be6..faab6dfc6d 100644 --- a/awx/ui/static/js/helpers/JobSubmission.js +++ b/awx/ui/static/js/helpers/JobSubmission.js @@ -39,7 +39,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential Rest.get() .success(function (data) { if(!Empty(data.extra_vars)){ - data.extra_vars = ToJSON('json', data.extra_vars, false); + data.extra_vars = ToJSON('yaml', data.extra_vars, false); $.each(data.extra_vars, function(key,value){ job_launch_data.extra_vars[key] = value; });