diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js index 902cb720a2a..c4d4a3987ad 100644 --- a/ui/scripts/installWizard.js +++ b/ui/scripts/installWizard.js @@ -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: { diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 01259c2e417..20ebad7fc09 100644 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -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));