External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-27 16:41:29 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65 from ansible/extra_vars

Browse Source 
send the yaml extra vars in raw form to the backend
This commit is contained in:
jlmitch5 2015-02-06 10:43:10 -05:00
commit 9a4ab0436a
1 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
awx/ui/static/js/helpers/Variables.js
View File

@ -35,11 +35,12 @@ angular.module('VariablesHelper', ['Utilities'])
}
catch (e) {
$log.info('Attempt to parse extra_vars as JSON failed. Attempting to parse as YAML');
$log.info('Attempt to parse extra_vars as JSON failed. Check that the variables parse as yaml. Set the raw string as the result.');
try {
// do safeLoad, which well error if not valid yaml
json_obj = jsyaml.safeLoad(variables);
json_obj = SortVariables(json_obj);
result = jsyaml.safeDump(json_obj);
// but just send the variables
result = variables;
}
catch(e2) {
ProcessErrors(null, variables, e2.message, null, { hdr: 'Error!',
@ -114,12 +115,7 @@ angular.module('VariablesHelper', ['Utilities'])
}
json_data = jsyaml.safeLoad(variables);
if(json_data!==null){
// $.each( json_data, function( key, value ) {
// if(value.toString() === "[object Object]"){
// json_data = undefined;
// throw 'Failed to parse YAML string. Parser returned ' + key + ' : ' + value + '.';
// }
// });
// unparsing just to make sure no weird characters are included.
tmp = jsyaml.dump(json_data);
if(tmp.indexOf('[object Object]')!==-1){
throw "Failed to parse YAML string. Parser returned' + key + ' : ' +value + '.' ";
@ -149,7 +145,9 @@ angular.module('VariablesHelper', ['Utilities'])
else if ($.isEmptyObject(json_data)) {
result = "";
} else {
result = JSON.stringify(json_data, undefined, '\t');
// utilize the parsing to get here
// but send the raw variable string
result = variables;
}
}
return result;
@ -178,31 +176,3 @@ angular.module('VariablesHelper', ['Utilities'])
return newObj;
};
}]);