Updated Branches: refs/heads/master 27900695f -> b9d8955f4
CLOUDSTACK-1617: cloudstack UI - IPv6 - zone wizard - hide IPv6 DNS 1, IPv6 DNS2 when Advanced SG-Enabled mode is selected. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9d8955f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9d8955f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9d8955f Branch: refs/heads/master Commit: b9d8955f4d9467467baa33416c4f939bdb76e08b Parents: 2790069 Author: Jessica Wang <[email protected]> Authored: Mon Apr 22 14:24:03 2013 -0700 Committer: Jessica Wang <[email protected]> Committed: Mon Apr 22 14:24:03 2013 -0700 ---------------------------------------------------------------------- ui/scripts/zoneWizard.js | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9d8955f/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index aa2c2fa..b282585 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -323,23 +323,30 @@ preFilter: function(args) { var $form = args.$form; - if (args.data['network-model'] == 'Basic') { + if (args.data['network-model'] == 'Basic') { //Basic zone args.$form.find('[rel=networkOfferingId]').show(); args.$form.find('[rel=guestcidraddress]').hide(); - args.$form.find('[rel=ip6dns1]').hide(); - args.$form.find('[rel=ip6dns2]').hide(); + + args.$form.find('[rel=ip6dns1]').hide(); + args.$form.find('[rel=ip6dns2]').hide(); } - else { //args.data['network-model'] == 'Advanced' + else { //Advanced zone args.$form.find('[rel=networkOfferingId]').hide(); - if(args.data["zone-advanced-sg-enabled"] != "on") + if(args.data["zone-advanced-sg-enabled"] != "on") { //Advanced SG-disabled zone args.$form.find('[rel=guestcidraddress]').show(); - else //args.data["zone-advanced-sg-enabled"] == "on - args.$form.find('[rel=guestcidraddress]').hide(); - - args.$form.find('[rel=ip6dns1]').show(); - args.$form.find('[rel=ip6dns2]').show(); - } + + args.$form.find('[rel=ip6dns1]').show(); + args.$form.find('[rel=ip6dns2]').show(); + } + else { //Advanced SG-enabled zone + args.$form.find('[rel=guestcidraddress]').hide(); + + args.$form.find('[rel=ip6dns1]').hide(); + args.$form.find('[rel=ip6dns2]').hide(); + } + + } setTimeout(function() { if ($form.find('input[name=ispublic]').is(':checked')) {
