resolved bugs for vcenter attributes in vnets and datastores

This commit is contained in:
juanmont authored and Tino Vázquez committed 2017-06-15 12:25:31 +02:00
1 parent 97474282ca
commit cd185bcd3d
2 files changed
+10 -4

No files matched your search

@@ -23,6 +23,7 @@ define(function(require) {
var Humanize = require('utils/humanize');
var RenameTr = require('utils/panel/rename-tr');
var TemplateTable = require('utils/panel/template-table');
var TemplateTableVcenter = require('utils/panel/template-table');
var PermissionsTable = require('utils/panel/permissions-table');
var OpenNebulaDatastore = require('opennebula/datastore');
var DatastoreCapacityBar = require('../utils/datastore-capacity-bar');
@@ -83,7 +84,7 @@ define(function(require) {
}
});
var templateTableHTML = TemplateTable.html(strippedTemplate, RESOURCE, Locale.tr("Attributes"), true);
var templateTableVcenterHTML = TemplateTable.html(strippedTemplateVcenter, RESOURCE, Locale.tr("vCenter information"), false);
var templateTableVcenterHTML = TemplateTableVcenter.html(strippedTemplateVcenter, RESOURCE, Locale.tr("vCenter information"), false);
var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
var capacityBar = DatastoreCapacityBar.html(this.element);
var stateStr = OpenNebulaDatastore.stateStr(this.element.STATE);
@@ -122,7 +123,10 @@ define(function(require) {
if($.isEmptyObject(strippedTemplateVcenter)){
$('.vcenter', context).hide();
}
TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context);
TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, undefined, strippedTemplateVcenter);
TemplateTableVcenter.setup(strippedTemplateVcenter, RESOURCE, this.element.ID, context, undefined, strippedTemplate);
PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
return false;
}
@@ -31,6 +31,7 @@ define(function(require) {
*/
var TemplateTable = require('utils/panel/template-table');
var TemplateTableVcenter = require('utils/panel/template-table');
/*
CONSTANTS
@@ -92,7 +93,7 @@ define(function(require) {
});
var templateTableHTML = TemplateTable.html(strippedTemplate, RESOURCE,
Locale.tr("Attributes"));
var templateTableVcenterHTML = TemplateTable.html(strippedTemplateVcenter, RESOURCE,
var templateTableVcenterHTML = TemplateTableVcenter.html(strippedTemplateVcenter, RESOURCE,
Locale.tr("vCenter information"), false);
//====
@@ -162,7 +163,8 @@ define(function(require) {
$('.vcenter', context).hide();
}
TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, hiddenValues);
TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, hiddenValues, strippedTemplateVcenter);
TemplateTableVcenter.setup(strippedTemplateVcenter, RESOURCE, this.element.ID, context, hiddenValues, strippedTemplate);
//===
return false;