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

Explicit Dedication through zone wizard

This commit is contained in:
Pranav Saxena 2013-05-30 16:28:25 +05:30
parent 5f11709ea4
commit 22ff6bb2ea
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/scripts/zoneWizard.js
View File

@ -544,8 +544,8 @@
ispublic: {
isReverse: true,
isBoolean: true,
label: 'label.public',
isChecked: true //checked by default (public zone)
label: 'Dedicate',
isChecked: false //checked by default (public zone)
},
domain: {
label: 'label.domain',
@ -1598,8 +1598,8 @@
array1.push("&internaldns2=" + todb(internaldns2));
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.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)
@ -1620,8 +1620,10 @@
dedicatedZoneId = json.createzoneresponse.zone.id;
//EXPLICIT ZONE DEDICATION
if(args.data.pluginFrom == null && args.data.zone.ispublic == null){
if(args.data.pluginFrom == null && args.data.zone.ispublic != null){
var array2 = [];
if(args.data.zone.domain != null)
array2.push("&domainid=" + args.data.zone.domain);
if(args.data.zone.accountId != "")
array2.push("&accountId=" +todb(args.data.zone.accountId));