mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	Merge branch 'master' of https://hugo@git-wip-us.apache.org/repos/asf/incubator-cloudstack.git
This commit is contained in:
		
						commit
						f128d8e123
					
				| @ -165,8 +165,9 @@ | ||||
|       preFilter: function(args) { | ||||
|         var havingSecurityGroupNetwork = false; | ||||
|         var havingBasicZones = false; | ||||
|         var havingAdvancedZones = true; | ||||
| 
 | ||||
|         // Get basic zones
 | ||||
|         // Get zone types
 | ||||
|         $.ajax({ | ||||
|           url: createURL('listZones'), | ||||
|           async: false, | ||||
| @ -176,8 +177,13 @@ | ||||
|             var basicZones = $.grep(zones, function(zone) { | ||||
|               return zone.networktype == 'Basic'; | ||||
|             }); | ||||
|             var advancedZones = $.grep(zones, function(zone) { | ||||
|               return zone.networktype == 'Advanced'; | ||||
|             }); | ||||
| 
 | ||||
|              | ||||
|             havingBasicZones = basicZones.length ? true : false; | ||||
|             havingAdvancedZones = advancedZones.length ? true : false;     | ||||
|       } | ||||
|         }); | ||||
|          | ||||
| @ -197,7 +203,7 @@ | ||||
| 
 | ||||
|         var sectionsToShow = ['networks']; | ||||
| 
 | ||||
|         if (!havingBasicZones) { | ||||
|         if (havingAdvancedZones) { | ||||
|           sectionsToShow.push('vpc'); | ||||
|           sectionsToShow.push('vpnCustomerGateway'); | ||||
|         } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user