From 04be74df9b3ddc414f7e040e02dd2b574bc5c261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 13 Jun 2016 12:15:24 +0200 Subject: [PATCH] Bug #4565: Fix html ids in vcenter import dialogs --- src/sunstone/public/app/utils/vcenter/clusters.js | 9 +++++---- src/sunstone/public/app/utils/vcenter/datastores.js | 9 +++++---- src/sunstone/public/app/utils/vcenter/images.js | 5 +++-- src/sunstone/public/app/utils/vcenter/networks.js | 3 ++- src/sunstone/public/app/utils/vcenter/templates.js | 3 ++- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/sunstone/public/app/utils/vcenter/clusters.js b/src/sunstone/public/app/utils/vcenter/clusters.js index b5f6a4c66c..e21222eef7 100644 --- a/src/sunstone/public/app/utils/vcenter/clusters.js +++ b/src/sunstone/public/app/utils/vcenter/clusters.js @@ -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 = '
' + '' + @@ -109,14 +110,14 @@ define(function(require) { '' + '' + '
' + - '
' + + '
' + '
' + '
'; '
'; $(".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 = $('
' + @@ -132,7 +133,7 @@ define(function(require) { '
' + '
' + '
' + - '').appendTo(tbody); + '').appendTo(tableDiv); $(".cluster_name", row).data("cluster_name", cluster_name); //$(".cluster_name", row).data("datacenter_name", datacenter_name); diff --git a/src/sunstone/public/app/utils/vcenter/datastores.js b/src/sunstone/public/app/utils/vcenter/datastores.js index 627b9c2d9c..2c19715028 100644 --- a/src/sunstone/public/app/utils/vcenter/datastores.js +++ b/src/sunstone/public/app/utils/vcenter/datastores.js @@ -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 = '
' + '' + @@ -120,7 +121,7 @@ define(function(require) { '' + '
' + '
' + - '' + + '
' + '' + '
' + '' + @@ -137,7 +138,7 @@ define(function(require) { ''; 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, diff --git a/src/sunstone/public/app/utils/vcenter/images.js b/src/sunstone/public/app/utils/vcenter/images.js index 48050db60f..edbaa82d73 100644 --- a/src/sunstone/public/app/utils/vcenter/images.js +++ b/src/sunstone/public/app/utils/vcenter/images.js @@ -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 = '
' + '' + @@ -151,7 +152,7 @@ define(function(require) { }); var imageDataTable = new DomDataTable( - 'vcenter_image_table_' + opts.vcenter_datastore, + tableId, { actions: false, info: false, diff --git a/src/sunstone/public/app/utils/vcenter/networks.js b/src/sunstone/public/app/utils/vcenter/networks.js index 56908d3f7a..73508ba8a7 100644 --- a/src/sunstone/public/app/utils/vcenter/networks.js +++ b/src/sunstone/public/app/utils/vcenter/networks.js @@ -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 = '
' + '' + diff --git a/src/sunstone/public/app/utils/vcenter/templates.js b/src/sunstone/public/app/utils/vcenter/templates.js index 8c38ec8e6f..4bca3f40d6 100644 --- a/src/sunstone/public/app/utils/vcenter/templates.js +++ b/src/sunstone/public/app/utils/vcenter/templates.js @@ -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 = '
' + '' +