mirror of https://github.com/apache/cloudstack.git
Merge remote-tracking branch 'origin/master'
* origin/master: cloudstack 3.0 UI - add network offering - fix a bug that wrongly calculated advanced zones.
This commit is contained in:
commit
16c844228a
|
|
@ -1027,11 +1027,15 @@
|
|||
// Check whether there are any advanced zones
|
||||
$.ajax({
|
||||
url: createURL('listZones'),
|
||||
data: { listAll: true, networktype: 'advanced' },
|
||||
data: { listAll: true },
|
||||
async: false,
|
||||
success: function(json) {
|
||||
if (json.listzonesresponse.zone && json.listzonesresponse.zone.length) {
|
||||
hasAdvancedZones = true;
|
||||
success: function(json) {
|
||||
var zones = json.listzonesresponse.zone;
|
||||
if (zones != null && zones.length > 0) {
|
||||
for(var i = 0; i < zones.length; i++) {
|
||||
if(zones[i].networktype == "Advanced")
|
||||
hasAdvancedZones = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue