From dca4a79b168e03c5f368bae50965ebe8d243ba0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 26 Apr 2016 11:45:06 +0200 Subject: [PATCH] Feature #4320: Fix tab navigation removing duplicated IDs --- .../form-panels/create/wizard-tabs/context.js | 1 + .../create/wizard-tabs/context/html.hbs | 12 ++++++------ .../form-panels/create/wizard-tabs/os.js | 9 +++++---- .../form-panels/create/wizard-tabs/os/html.hbs | 16 ++++++++-------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js index d47b5d6c1a..ca80eb56dd 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js @@ -80,6 +80,7 @@ define(function(require) { function _html() { return TemplateHTML({ + 'uniqueId': UniqueId.id(), 'userInputsHTML': UserInputs.html(), 'customTagsTableHTML': CustomTagsTable.html(), 'contextFilesTableHTML': this.contextFilesTable.dataTableHTML diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs index 7e54e8e0aa..ffcc2fb36c 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs @@ -36,19 +36,19 @@
-
+
@@ -112,7 +112,7 @@
-
+
{{{contextFilesTableHTML}}}
@@ -133,7 +133,7 @@
-
{{{customTagsTableHTML}}}
+
{{{customTagsTableHTML}}}
\ No newline at end of file diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js index fd7d0c205c..274aafe567 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js @@ -178,6 +178,7 @@ define(function(require) { function _html() { return TemplateHTML({ + 'uniqueId': UniqueId.id(), 'guestOS': GUESTOS, 'kernelFilesTableHTML': this.kernelFilesTable.dataTableHTML, 'initrdFilesTableHTML': this.initrdFilesTable.dataTableHTML @@ -246,9 +247,9 @@ define(function(require) { function _retrieve(context) { var templateJSON = {}; var osJSON = {} - $.extend(osJSON, WizardFields.retrieve('#bootTab', context)); - $.extend(osJSON, WizardFields.retrieve('#kernelTab', context)); - $.extend(osJSON, WizardFields.retrieve('#ramdiskTab', context)); + $.extend(osJSON, WizardFields.retrieve('.bootTab', context)); + $.extend(osJSON, WizardFields.retrieve('.kernelTab', context)); + $.extend(osJSON, WizardFields.retrieve('.ramdiskTab', context)); var boot = ""; var val; @@ -266,7 +267,7 @@ define(function(require) { if (!$.isEmptyObject(osJSON)) { templateJSON['OS'] = osJSON; }; - var featuresJSON = WizardFields.retrieve('#featuresTab', context) + var featuresJSON = WizardFields.retrieve('.featuresTab', context) if (!$.isEmptyObject(featuresJSON)) { templateJSON['FEATURES'] = featuresJSON; }; return templateJSON; diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs index 40ca5fd216..46db282bc2 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs @@ -17,22 +17,22 @@
-
+
-
+
@@ -152,7 +152,7 @@
-
+
@@ -183,7 +183,7 @@
-
+