diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index 5291e5bb5e..4087c0abe5 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -571,8 +571,17 @@ define(function(require) { $('.top_button, .list_button', context).attr('disabled', false); } + // Returns the element that is currently shown in the right info + var _getElementRightInfo = function(tabName, context) { + var context = context || $(".right-info", $("#" + tabName)); + return context.data('element'); + } + var _insertPanels = function(tabName, info, contextTabId, context) { var context = context || $(".right-info", $("#" + tabName)); + + context.data('element', info[Object.keys(info)[0]]); + var containerId = tabName + '-panels'; var activaTab = $("dd.active a", $("#" + containerId)); if (activaTab) { @@ -1006,6 +1015,7 @@ define(function(require) { "insertTabs": _insertTabs, "insertPanels": _insertPanels, + "getElementRightInfo": _getElementRightInfo, 'showTab': _showTab, "showElement" : _showElement, diff --git a/src/sunstone/public/app/utils/labels/utils.js b/src/sunstone/public/app/utils/labels/utils.js index c63e722923..35e863610b 100644 --- a/src/sunstone/public/app/utils/labels/utils.js +++ b/src/sunstone/public/app/utils/labels/utils.js @@ -334,9 +334,19 @@ define(function(require) { } function _getLabel(dataTable, labelsColumn, resourceId) { - var nodes = dataTable.fnGetNodes(); - var tr = $('.check_item[value="' + resourceId + '"]', nodes).closest('tr'); - var aData = dataTable.fnGetData(tr); - return aData[labelsColumn]; + var tab = dataTable.parents(".tab") + if (Sunstone.rightInfoVisible(tab)) { + var element = Sunstone.getElementRightInfo(tab.attr('id')); + if (element && element.TEMPLATE) { + return element.TEMPLATE[LABELS_ATTR]||''; + } else { + return ''; + } + } else { + var nodes = dataTable.fnGetNodes(); + var tr = $('.check_item[value="' + resourceId + '"]', nodes).closest('tr'); + var aData = dataTable.fnGetData(tr); + return aData[labelsColumn]; + } } });