Updated Branches: refs/heads/UI-explicitDedication 5f11709ea -> 22ff6bb2e
Explicit Dedication through zone wizard Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/22ff6bb2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/22ff6bb2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/22ff6bb2 Branch: refs/heads/UI-explicitDedication Commit: 22ff6bb2ea5257c9ddc90e1294b7549aa8510f50 Parents: 5f11709 Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Thu May 30 16:28:25 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Thu May 30 16:28:25 2013 +0530 ---------------------------------------------------------------------- ui/scripts/zoneWizard.js | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/22ff6bb2/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 8fbb3ad..7dad2b8 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -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));
