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

Bug #4565: Fix html ids in vcenter import dialogs

Browse Source
This commit is contained in:
Carlos Martín 2016-06-13 12:15:24 +02:00
parent be358f6d80
commit 04be74df9b
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sunstone/public/app/utils/vcenter/clusters.js
View File

@ -21,6 +21,7 @@ define(function(require) {
var OpenNebulaHost = require('opennebula/host');
var OpenNebulaError = require('opennebula/error');
var Notifier = require('utils/notifier');
var UniqueId = require('utils/unique-id');
var TemplateHTML = require('hbs!./clusters/html');
@ -93,7 +94,7 @@ define(function(require) {
$(".vcenter_datacenter_list", context).append(content);
} else {
var tableId = "vcenter_network_table_" + datacenter_name;
var tableId = "vcenter_cluster_table_" + UniqueId.id();
content =
'<fieldset>' +
'<legend>' +
@ -109,14 +110,14 @@ define(function(require) {
'</ul>' +
'</legend>' +
'<div class="row">' +
'<div class="large-12 columns" id="vcenter_cluster_table_' + datacenter_name + '">' +
'<div class="large-12 columns" id="' + tableId + '">' +
'</div>' +
'</div>';
'</fieldset>';
$(".vcenter_datacenter_list", context).append(content);
var tbody = $('#vcenter_cluster_table_' + datacenter_name, context);
var tableDiv = $('#' + tableId, context);
$.each(clusters, function(id, cluster_name) {
var row = $('<div class="vcenter_cluster">' +
@ -132,7 +133,7 @@ define(function(require) {
'<div class="large-2 columns vcenter_host_result">' +
'</div>' +
'</div>' +
'</div>').appendTo(tbody);
'</div>').appendTo(tableDiv);
$(".cluster_name", row).data("cluster_name", cluster_name);
//$(".cluster_name", row).data("datacenter_name", datacenter_name);

9
src/sunstone/public/app/utils/vcenter/datastores.js
View File

@ -21,6 +21,7 @@ define(function(require) {
var OpenNebulaError = require('opennebula/error');
var DomDataTable = require('utils/dom-datatable');
var Notifier = require('utils/notifier');
var UniqueId = require('utils/unique-id');
var TemplateHTML = require('hbs!./datastores/html');
@ -98,7 +99,7 @@ define(function(require) {
$(".vcenter_datacenter_list", context).append(content);
} else {
var tableId = "vcenter_network_table_" + datacenter_name;
var tableId = "vcenter_datastore_table" + UniqueId.id();
content =
'<fieldset>' +
'<legend>' +
@ -120,7 +121,7 @@ define(function(require) {
'</legend>' +
'<div class="row">' +
'<div class="large-12 columns">' +
'<table class="dataTable vcenter_datastore_table" id="vcenter_datastore_table_' + datacenter_name + '">' +
'<table class="dataTable vcenter_datastore_table" id="' + tableId + '">' +
'<thead>' +
'<th class="check">' +
'<input type="checkbox" class="check_all"/>' +
@ -137,7 +138,7 @@ define(function(require) {
'</fieldset>';
var newdiv = $(content).appendTo($(".vcenter_datacenter_list", context));
var tbody = $('#vcenter_datastore_table_' + datacenter_name + ' tbody', context);
var tbody = $('#' + tableId + ' tbody', context);
$.each(datastores, function(id, datastore){
var trow = $(
@ -154,7 +155,7 @@ define(function(require) {
});
var tmplDataTable = new DomDataTable(
'vcenter_datastore_table_' + datacenter_name,
tableId,
{
actions: false,
info: false,

5
src/sunstone/public/app/utils/vcenter/images.js
View File

@ -21,6 +21,7 @@ define(function(require) {
var OpenNebulaError = require('opennebula/error');
var DomDataTable = require('utils/dom-datatable');
var Notifier = require('utils/notifier');
var UniqueId = require('utils/unique-id');
var TemplateHTML = require('hbs!./images/html');
@ -94,7 +95,7 @@ define(function(require) {
$(".vcenter_datacenter_list", context).append(content);
} else {
var tableId = "vcenter_image_table_" + opts.vcenter_datastore;
var tableId = "vcenter_image_table_" + UniqueId.id();
content =
'<fieldset>' +
'<legend>' +
@ -151,7 +152,7 @@ define(function(require) {
});
var imageDataTable = new DomDataTable(
'vcenter_image_table_' + opts.vcenter_datastore,
tableId,
{
actions: false,
info: false,

3
src/sunstone/public/app/utils/vcenter/networks.js
View File

@ -22,6 +22,7 @@ define(function(require) {
var DomDataTable = require('utils/dom-datatable');
var CustomLayoutDataTable = require('utils/custom-layout-table');
var Notifier = require('utils/notifier');
var UniqueId = require('utils/unique-id');
var TemplateHTML = require('hbs!./networks/html');
var EmptyTableTemplate = require('hbs!./networks/empty-table');
@ -97,7 +98,7 @@ define(function(require) {
$(".vcenter_datacenter_list", context).append(content);
} else {
var tableId = "vcenter_network_table_" + datacenter_name;
var tableId = "vcenter_network_table_" + UniqueId.id();
content =
'<fieldset>' +
'<legend>' +

3
src/sunstone/public/app/utils/vcenter/templates.js
View File

@ -23,6 +23,7 @@ define(function(require) {
var CustomLayoutDataTable = require('utils/custom-layout-table');
var UserInputs = require('utils/user-inputs');
var Notifier = require('utils/notifier');
var UniqueId = require('utils/unique-id');
var TemplateHTML = require('hbs!./templates/html');
var EmptyTableTemplate = require('hbs!./templates/empty-table');
@ -98,7 +99,7 @@ define(function(require) {
$(".vcenter_datacenter_list", context).append(content);
} else {
var tableId = "vcenter_template_table_" + datacenter_name;
var tableId = "vcenter_template_table_" + UniqueId.id();
content =
'<fieldset>' +
'<legend>' +