cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [14/100] [abbrv] git commit: CLOUDSTACK-484: cloudstack UI - zone wizard - Hide Guest CIDR field when Advanced/SecurityGroup is selected. Show it otherwise.
Date Thu, 06 Dec 2012 08:09:08 GMT
CLOUDSTACK-484: cloudstack UI - zone wizard - Hide Guest CIDR field when Advanced/SecurityGroup
is selected. Show it otherwise.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/60cec463
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/60cec463
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/60cec463

Branch: refs/heads/events-framework
Commit: 60cec46333da34937475a98c150e82940ae7baef
Parents: d1fb2f7
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Wed Nov 14 14:39:54 2012 -0800
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Wed Nov 14 14:39:54 2012 -0800

----------------------------------------------------------------------
 ui/scripts/zoneWizard.js |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/60cec463/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 6cbcb69..901ab1e 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -304,7 +304,11 @@
           }
           else { //args.data['network-model'] == 'Advanced'
             args.$form.find('[rel=networkOfferingId]').hide();
-            args.$form.find('[rel=guestcidraddress]').show();
+												
+						if(args.data["zone-isolation-mode"]	== "VLAN")
+              args.$form.find('[rel=guestcidraddress]').show();
+						else //args.data["zone-isolation-mode"] == "SG"
+						  args.$form.find('[rel=guestcidraddress]').hide();
           }													
 										
           setTimeout(function() {
@@ -1256,14 +1260,18 @@
           var networkType = args.data.zone.networkType;  //"Basic", "Advanced"
           array1.push("&networktype=" + todb(networkType));
           if(networkType == "Advanced") {
-            if(args.data.zone.guestcidraddress != null && args.data.zone.guestcidraddress.length
> 0)
-              array1.push("&guestcidraddress=" + todb(args.data.zone.guestcidraddress));
+            
 						
-            if(args.data.zone.isolationMode != null) {
-              if(args.data.zone.isolationMode	== "SG")
-                array1.push("&securitygroupenabled=true");   
-              else if(args.data.zone.isolationMode	== "VLAN")
-							  array1.push("&securitygroupenabled=false");  
+            if(args.data.zone.isolationMode != null) {               
+              if(args.data.zone.isolationMode	== "VLAN") {
+							  array1.push("&securitygroupenabled=false"); 
+								
+								if(args.data.zone.guestcidraddress != null && args.data.zone.guestcidraddress.length
> 0)
+                  array1.push("&guestcidraddress=" + todb(args.data.zone.guestcidraddress));
							
+							}
+              else { // args.data.zone.isolationMode == "SG"
+                array1.push("&securitygroupenabled=true");   	
+              }								
             }									
           }
 


Mime
View raw message