bug 12614: cloudStack 3.0 new UI - system - Add Zone Wizard - basic zone - when securityGroupsEnabled checkbox is checked, only display security-group-enabled network offerings.

This commit is contained in:
Jessica Wang 2011-12-20 11:55:42 -08:00
parent 16cd1f8f28
commit 171da7e3aa

View File

@ -2906,6 +2906,7 @@
}
});
var networkOfferingObjsWithSG = [];
var networkOfferingObjsWithoutSG = [];
$.ajax({
url: createURL("listNetworkOfferings&state=Enabled&guestiptype=Shared"),
@ -2923,8 +2924,10 @@
break;
}
}
if(includingSGP == false) //withoutSG
networkOfferingObjsWithoutSG.push(this);
if(includingSGP == false) //without SG
networkOfferingObjsWithoutSG.push(this);
else //with SG
networkOfferingObjsWithSG.push(this);
});
}
});
@ -2936,7 +2939,7 @@
networkOfferings: networkOfferingObjsWithoutSG,
// Security group-enabled offerings
securityGroupNetworkOfferings: networkOfferingObjs
securityGroupNetworkOfferings: networkOfferingObjsWithSG
});
},