From 8024aa2c1c02f6ffaf987de473c6e92a663f1037 Mon Sep 17 00:00:00 2001 From: Sergio Betanzos Date: Wed, 12 Feb 2020 18:36:20 +0100 Subject: [PATCH] B #4169: Fix clusters in VNet templates (#4182) --- .../tabs/vnets-templates-tab/form-panels/create.js | 11 +++++------ .../app/tabs/vnets-templates-tab/panels/clusters.js | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js index fdac2b1316..3bbd36765b 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js @@ -364,7 +364,7 @@ define(function(require) { var clusters = this.clustersTable.retrieveResourceTableSelect(); if (clusters != undefined && clusters.length != 0) { - network_json["CLUSTERS"] = clusters.join(","); + network_json["CLUSTERS_IDS"] = clusters.join(","); } $.extend(network_json, CustomTagsTable.retrieve($("#vntemplateCreateContextTab", context))); @@ -395,16 +395,15 @@ define(function(require) { } function _submitAdvanced(context) { + var template = $("textarea#template", context).val(); + if (this.action == "create") { - var template = $("textarea#template", context).val(); - var vntemplate_json = {vntemplate: {vntemplate_raw: template}}; + var vntemplate_json = {vntemplate: { vntemplate_raw: template}}; Sunstone.runAction("VNTemplate.create", vntemplate_json); return false; } else if (this.action == "update") { - var template_raw = $("textarea#template", context).val(); - var vntemplate_json = {vntemplate: {vntemplate_raw: template}}; - Sunstone.runAction("VNTemplate.update", this.resourceId, vntemplate_json); + Sunstone.runAction("VNTemplate.update", this.resourceId, template); return false; } } diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters.js index 0c1ff35717..cddba9a538 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters.js @@ -58,7 +58,7 @@ define(function(require){ var clusters = []; if (this.element.TEMPLATE.CLUSTERS != undefined){ - clusters = this.element.TEMPLATE.CLUSTERS.split(","); + clusters = this.element.TEMPLATE.CLUSTERS_IDS.split(","); if (!$.isArray(clusters)){ clusters = [clusters];