shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-26 06:50:09 +03:00
Code Releases Wiki Activity

Bug #4301: Do not retrieve label info from the datatable when in the detailed view

Browse Source
This commit is contained in:
Daniel Molina 2016-02-17 16:30:51 +01:00
parent 146daa65fd
commit b57f36d620
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sunstone/public/app/sunstone.js
View File

@ -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,

18
src/sunstone/public/app/utils/labels/utils.js
View File

@ -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];
}
}
});