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

bug 14073: Quick Installer - make zones created from Quick Installer to be public (not dedicated to any domain)

This commit is contained in:
Jessica Wang 2012-02-29 15:22:36 -08:00
parent e992a25e1a
commit e6d43e157e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/scripts/installWizard.js
View File

@ -264,8 +264,7 @@
// Plug in hard-coded values specific to quick install
data: {
zone: {
networkType: 'Basic',
domain: 1,
networkType: 'Basic',
networkOfferingId: selectedNetworkOffering.id
},
pluginFrom: {

8
ui/scripts/zoneWizard.js
View File

@ -1017,9 +1017,11 @@
if (internaldns2 != null && internaldns2.length > 0)
array1.push("&internaldns2=" + todb(internaldns2));
if(args.data.zone.ispublic == null) //public checkbox is unchecked
array1.push("&domainid=" + args.data.zone.domain);
if(args.data.pluginFrom == null) { //from zone wizard, not from quick instsaller(args.data.pluginFrom != null && args.data.pluginFrom.name == 'installWizard') who doesn't have public checkbox
if(args.data.zone.ispublic == null) //public checkbox in zone wizard is unchecked
array1.push("&domainid=" + args.data.zone.domain);
}
if(args.data.zone.networkdomain != null && args.data.zone.networkdomain.length > 0)
array1.push("&domain=" + todb(args.data.zone.networkdomain));