Repository: incubator-atlas Updated Branches: refs/heads/master 8cc5e510f -> 97209e817
ATLAS-1714 : UI : Properties tab doesn't load when an entity has attribute of type array of integers Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/97209e81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/97209e81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/97209e81 Branch: refs/heads/master Commit: 97209e817a73ab34093687a059c45f3ee5e95027 Parents: 8cc5e51 Author: kevalbhatt <[email protected]> Authored: Tue Apr 11 18:42:28 2017 +0530 Committer: kevalbhatt <[email protected]> Committed: Tue Apr 11 18:42:52 2017 +0530 ---------------------------------------------------------------------- .../public/js/utils/CommonViewFunction.js | 35 +++++++++++--------- 1 file changed, 20 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/97209e81/dashboardv2/public/js/utils/CommonViewFunction.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js index 615bef4..1890ce3 100644 --- a/dashboardv2/public/js/utils/CommonViewFunction.js +++ b/dashboardv2/public/js/utils/CommonViewFunction.js @@ -145,7 +145,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum inputOutputField['attributes'] = inputOutputField.values; } 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>'); } } else if (_.isObject(inputOutputField) && !id) { @@ -157,8 +158,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum } } _.each(attributesList, function(objValue, objKey) { - var value = objValue; - if (objKey.indexOf("$") == -1) { + var value = objValue, + tempVarfor$check = objKey.toString(); + if (tempVarfor$check.indexOf("$") == -1) { if (_.isObject(value)) { value = JSON.stringify(value); } @@ -204,21 +206,24 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum table += '<tr><td>' + _.escape(key) + '</td><td>' + subLink + '</td></tr>'; } } else { - if (key.indexOf("Time") !== -1 || key == "retention") { - if (searchTable) { - table = new Date(valueObject[key]); - } else { - table += '<tr><td>' + _.escape(key) + '</td><td>' + new Date(valueObject[key]) + '</td></tr>'; - } - } else { - if (searchTable) { - if (_.isBoolean(valueObject[key])) { - table = valueObject[key].toString(); + var tempVarfor$check = key.toString(); + if (tempVarfor$check.indexOf("$") == -1) { + if (key.indexOf("Time") !== -1 || key == "retention") { + if (searchTable) { + table = new Date(valueObject[key]); } else { - table = valueObject[key]; + table += '<tr><td>' + _.escape(key) + '</td><td>' + new Date(valueObject[key]) + '</td></tr>'; } } else { - table += '<tr><td>' + _.escape(key) + '</td><td>' + _.escape(valueObject[key]) + '</td></tr>'; + if (searchTable) { + if (_.isBoolean(valueObject[key])) { + table = valueObject[key].toString(); + } else { + table = valueObject[key]; + } + } else { + table += '<tr><td>' + _.escape(key) + '</td><td>' + _.escape(valueObject[key]) + '</td></tr>'; + } } } }
