External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-20 04:30:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixes for AC-212 & AC-2088

Browse Source
This commit is contained in:
chouseknecht
2013-07-11 17:18:25 -04:00
parent 36e8dcff7c
commit ab6fca64a0
15 changed files with 374 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/static/js/controllers/JobTemplates.js
View File

@@ -250,12 +250,16 @@ function JobTemplatesAdd ($scope, $rootScope, $compile, $location, $log, $routeP
try {
// Make sure we have valid variable data
if (scope.parseType == 'json') {
var myjson = JSON.parse(scope.variables); //make sure JSON parses
var json_data = scope.variables;
var json_data = JSON.parse(scope.variables); //make sure JSON parses
}
else {
var json_data = jsyaml.load(scope.variables); //parse yaml
}
// Make sure our JSON is actually an object
if (typeof json_data !== 'object') {
throw "failed to return an object!";
}
for (var fld in form.fields) {
if (form.fields[fld].type == 'select' && fld != 'playbook') {
@@ -479,6 +483,11 @@ function JobTemplatesEdit ($scope, $rootScope, $compile, $location, $log, $route
var json_data = jsyaml.load(scope.variables); //parse yaml
}
// Make sure our JSON is actually an object
if (typeof json_data !== 'object') {
throw "failed to return an object!";
}
for (var fld in form.fields) {
if (form.fields[fld].type == 'select' && fld != 'playbook') {
data[fld] = scope[fld].value;