Commit 97209e81 by kevalbhatt

ATLAS-1714 : UI : Properties tab doesn't load when an entity has attribute of…

ATLAS-1714 : UI : Properties tab doesn't load when an entity has attribute of type array of integers
parent 8cc5e510
...@@ -145,7 +145,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -145,7 +145,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
inputOutputField['attributes'] = inputOutputField.values; inputOutputField['attributes'] = inputOutputField.values;
} }
if (_.isString(inputOutputField) || _.isBoolean(inputOutputField) || _.isNumber(inputOutputField)) { if (_.isString(inputOutputField) || _.isBoolean(inputOutputField) || _.isNumber(inputOutputField)) {
if (inputOutputField.indexOf("$") == -1) { var tempVarfor$check = inputOutputField.toString();
if (tempVarfor$check.indexOf("$") == -1) {
valueOfArray.push('<span>' + _.escape(inputOutputField) + '</span>'); valueOfArray.push('<span>' + _.escape(inputOutputField) + '</span>');
} }
} else if (_.isObject(inputOutputField) && !id) { } else if (_.isObject(inputOutputField) && !id) {
...@@ -157,8 +158,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -157,8 +158,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
} }
} }
_.each(attributesList, function(objValue, objKey) { _.each(attributesList, function(objValue, objKey) {
var value = objValue; var value = objValue,
if (objKey.indexOf("$") == -1) { tempVarfor$check = objKey.toString();
if (tempVarfor$check.indexOf("$") == -1) {
if (_.isObject(value)) { if (_.isObject(value)) {
value = JSON.stringify(value); value = JSON.stringify(value);
} }
...@@ -204,6 +206,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -204,6 +206,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
table += '<tr><td>' + _.escape(key) + '</td><td>' + subLink + '</td></tr>'; table += '<tr><td>' + _.escape(key) + '</td><td>' + subLink + '</td></tr>';
} }
} else { } else {
var tempVarfor$check = key.toString();
if (tempVarfor$check.indexOf("$") == -1) {
if (key.indexOf("Time") !== -1 || key == "retention") { if (key.indexOf("Time") !== -1 || key == "retention") {
if (searchTable) { if (searchTable) {
table = new Date(valueObject[key]); table = new Date(valueObject[key]);
...@@ -222,6 +226,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -222,6 +226,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
} }
} }
} }
}
}); });
return table; return table;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment