From 944f7ba89cbb80b36c44504c44d1aa2b4eef8d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 9 Oct 2014 18:16:42 +0200 Subject: [PATCH] Feature #3175: Update sec groups in Template nic --- .../public/js/plugins/templates-tab.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 4de29be25f..2465b1b6a7 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -1826,7 +1826,9 @@ function retrieve_nic_tab_data(context){ var secgroups = retrieveSecurityGroupTableSelect(context, "vm_create_nic_"+str_nic_tab_id); - data["SECURITY_GROUPS"] = secgroups.join(","); + if (secgroups != undefined && secgroups.length != 0){ + data["SECURITY_GROUPS"] = secgroups.join(","); + } return data } @@ -1861,6 +1863,18 @@ function fill_nic_tab_data(template_json, context){ var field = $("#icmp_type", context); $("#icmp_type", context).attr('checked','checked'); } + + var str_nic_tab_id = $("div[str_nic_tab_id]", context).attr("str_nic_tab_id"); + + if (template_json["SECURITY_GROUPS"] != undefined && + template_json["SECURITY_GROUPS"].length != 0){ + + var secgroups = template_json["SECURITY_GROUPS"].split(","); + + selectSecurityGroupTableSelect(context, "vm_create_nic_"+str_nic_tab_id, secgroups); + } else { + refreshSecurityGroupTableSelect(context, "vm_create_nic_"+str_nic_tab_id); + } } function setup_nic_tab_content(nic_section, str_nic_tab_id, str_datatable_id) { @@ -3179,7 +3193,7 @@ function add_nic_tab(nic_id, dialog) { var str_nic_tab_id = 'nic' + nic_id; var str_datatable_id = 'datatable_template_networks' + nic_id; - var html_tab_content = '
'+ + var html_tab_content = '
'+ generate_nic_tab_content(str_nic_tab_id, str_datatable_id) + '
'