Explicit Dedication : Zone
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e94c8176 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e94c8176 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e94c8176 Branch: refs/heads/master Commit: e94c8176d2401f3bd59770a7c77ada3021b02c70 Parents: 5fe0d02 Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Thu May 30 18:08:04 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Thu May 30 21:57:17 2013 +0530 ---------------------------------------------------------------------- ui/scripts/zoneWizard.js | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e94c8176/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 809b83a..04ed495 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -348,11 +348,18 @@ } - setTimeout(function() { + /* setTimeout(function() { if ($form.find('input[name=ispublic]').is(':checked')) { - $form.find('[rel=domain]').hide(); + $form.find('[rel=domain]').show(); + $form.find('[rel=accountId]').show(); } - }); + + else{ + + $form.find('[rel=domain]').hide(); + $form.find('[rel=accountId]').hide(); + } + });*/ }, fields: { name: { @@ -541,7 +548,7 @@ validation: { required: false } }, ispublic: { - isReverse: true, + //isReverse: true, isBoolean: true, label: 'Dedicate', isChecked: false //checked by default (public zone) @@ -1597,8 +1604,10 @@ 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 + // 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) @@ -1622,13 +1631,13 @@ 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); + array2.push("&domainid=" + args.data.zone.domain); if(args.data.zone.accountId != "") array2.push("&accountId=" +todb(args.data.zone.accountId)); if(dedicatedZoneId != null){ $.ajax({ - url:createURL("dedicateZone&ZoneId=" +dedicatedZoneId +"&domain=" +args.data.zone.domain + array2.join("")), + url:createURL("dedicateZone&ZoneId=" +dedicatedZoneId + array2.join("")), dataType:"json", success:function(json){ var dedicatedObj = json.dedicatezoneresponse.jobid;
