diff --git a/src/sunstone/public/js/plugins/secgroups-tab.js b/src/sunstone/public/js/plugins/secgroups-tab.js index 85e7f7c4f6..1a2fa59be7 100644 --- a/src/sunstone/public/js/plugins/secgroups-tab.js +++ b/src/sunstone/public/js/plugins/secgroups-tab.js @@ -465,7 +465,7 @@ function securityGroupElements(){ return getSelectedNodes(dataTable_security_groups); } -function security_groupElementArray(element_json){ +function securityGroupElementArray(element_json){ var element = element_json.SECURITY_GROUP; @@ -481,7 +481,7 @@ function security_groupElementArray(element_json){ //callback for an action affecting a security_group element function updateSecurityGroupElement(request, element_json){ var id = element_json.SECURITY_GROUP.ID; - var element = security_groupElementArray(element_json); + var element = securityGroupElementArray(element_json); updateSingleElement(element,dataTable_security_groups,'#security_group_'+id); } @@ -494,7 +494,7 @@ function deleteSecurityGroupElement(req){ //call back for actions creating a security_group element function addSecurityGroupElement(request,element_json){ var id = element_json.SECURITY_GROUP.ID; - var element = security_groupElementArray(element_json); + var element = securityGroupElementArray(element_json); addElement(element,dataTable_security_groups); } @@ -504,7 +504,7 @@ function updateSecurityGroupsView (request,list){ $.each(list,function(){ //Grab table data from the list - list_array.push(security_groupElementArray(this)); + list_array.push(securityGroupElementArray(this)); }); updateView(list_array,dataTable_security_groups); diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 063412a584..4de29be25f 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -1786,6 +1786,12 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){ ''+ ''+ ''+ + ''+ + '
'}); $("#refresh_template_nic_table_button_class"+str_nic_tab_id).die(); @@ -1815,6 +1821,13 @@ function retrieve_nic_tab_data(context){ data["ICMP"] = "drop" } + var str_nic_tab_id = $('div[name="str_nic_tab_id"]', context).attr("str_nic_tab_id"); + + var secgroups = retrieveSecurityGroupTableSelect(context, + "vm_create_nic_"+str_nic_tab_id); + + data["SECURITY_GROUPS"] = secgroups.join(","); + return data } @@ -1907,6 +1920,11 @@ function setup_nic_tab_content(nic_section, str_nic_tab_id, str_datatable_id) { return true; }); + setupSecurityGroupTableSelect(nic_section, "vm_create_nic_"+str_nic_tab_id, + {"multiple_choice": true}); + + refreshSecurityGroupTableSelect(nic_section, "vm_create_nic_"+str_nic_tab_id); + setupTips(nic_section); } diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index e1f064e662..54597cd1a4 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -37,6 +37,7 @@ var create_vn_tmpl =