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:
abhi 2012-04-30 16:42:37 +05:30
commit 16c844228a
1 changed files with 8 additions and 4 deletions

View File

@ -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;
}
}
}
});