From 0eb583df1a490e9968add2d661d5275497544bb6 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 7 Feb 2012 15:55:18 -0800 Subject: [PATCH] cloudstack 3.0 new UI - deployVM - step 5 - (1) Show network list if it's an advanced zone. (2) Show security group list if it's a Basic zone with SecurityGroup service. (3) Show nothing if it's a Basic zone without SecurityGroup service. --- ui/scripts/instances.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 4ca1028ac4c..cabce11f21d 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -218,10 +218,10 @@ } } - if (selectedZoneObj.securitygroupsenabled == false) { //show network container + if (selectedZoneObj.networktype == "Advanced") { //Advanced zone. Show network list. step5ContainerType = 'select-network'; } - else if (selectedZoneObj.securitygroupsenabled == true) { // if security group is enabled + else { //Basic zone. Show securigy group list or nothing(when no SecurityGroup service in guest network) var includingSecurityGroupService = false; $.ajax({ url: createURL("listNetworks&trafficType=Guest&zoneId=" + selectedZoneObj.id), @@ -231,7 +231,7 @@ //basic zone should have only one guest network returned in this API call var items = json.listnetworksresponse.network; if(items != null && items.length > 0) { - var networkObj = items[0]; + var networkObj = items[0]; //basic zone has only one guest network var serviceObjArray = networkObj.service; for(var k = 0; k < serviceObjArray.length; k++) { if(serviceObjArray[k].name == "SecurityGroup") {