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

Variable parsing

Browse Source 
expanded the variable parsing to disregard an empty string inside of an empty string ("\"\"")
This commit is contained in:
Jared Tabor
2015-01-06 12:54:34 -05:00
parent 5e2f915236
commit 9c3b3aab90
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ angular.module('VariablesHelper', ['Utilities'])
return function (variables) { return function (variables) {
var result = "---", json_obj; var result = "---", json_obj;
if (typeof variables === 'string') { if (typeof variables === 'string') {
if (variables === "{}" || variables === "null" || variables === "") { if (variables === "{}" || variables === "null" || variables === "" || variables === "\"\"") {
// String is empty, return --- // String is empty, return ---
} else { } else {
try { try {
@@ -156,7 +156,9 @@ angular.module('VariablesHelper', ['Utilities'])
return function(variableObj) { return function(variableObj) {
var newObj; var newObj;
function sortIt(objToSort) { function sortIt(objToSort) {
var i, keys = Object.keys(objToSort), newObj = {}; var i,
keys = Object.keys(objToSort),
newObj = {};
keys = keys.sort(); keys = keys.sort();
for (i=0; i < keys.length; i++) { for (i=0; i < keys.length; i++) {
if (typeof objToSort[keys[i]] === 'object' && objToSort[keys[i]] !== null && !Array.isArray(objToSort[keys[i]])) { if (typeof objToSort[keys[i]] === 'object' && objToSort[keys[i]] !== null && !Array.isArray(objToSort[keys[i]])) {