etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - Network menu - guest network section - (1) hide create network button if there is no Advacned SG-disabled zones. (2) create network dialog - zone dropdown - populate only Advacned SG-disabled zones.

This commit is contained in:
Jessica Wang 2012-11-26 13:12:41 -08:00
parent b949813438
commit 1fb80fc6ce
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ui/scripts/network.js
View File

@ -309,24 +309,17 @@
label: 'label.add.guest.network',
preFilter: function(args) {
var basicZoneExists = true; //Modifying the logic behind displaying the tabs depending on the networktype
$.ajax({
url: createURL("listZones"),
dataType: "json",
async: false,
success: function(json) {
if(json.listzonesresponse.zone != null && json.listzonesresponse.zone.length > 0) {
zoneObjs = json.listzonesresponse.zone;
$(zoneObjs).each(function() {
if(this.networktype == "Advanced") {
basicZoneExists = false; // For any occurence of an Advanced zone with any combination of basic zone , the add guest network tab will be displayed
return false; //break each loop
}
});
}
}
})
return !basicZoneExists; //hide Add guest network button if any basic zone exists
var advSgDisabledZones;
$.ajax({
url: createURL('listZones'),
async: false,
success: function(json) {
advSgDisabledZones = $.grep(json.listzonesresponse.zone, function(zone) {
return (zone.networktype == 'Advanced' && zone.securitygroupsenabled != true); //Isolated networks can only be created in Advanced SG-disabled zone (but not in Basic zone nor Advanced SG-enabled zone)
});
}
});
return (advSgDisabledZones.length > 0);
},
createForm: {
@ -345,7 +338,7 @@
url: createURL('listZones'),
success: function(json) {
var zones = $.grep(json.listzonesresponse.zone, function(zone) {
return zone.networktype == 'Advanced';
return (zone.networktype == 'Advanced' && zone.securitygroupsenabled != true); //Isolated networks can only be created in Advanced SG-disabled zone (but not in Basic zone nor Advanced SG-enabled zone)
});
args.response.success({