Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 452F7F178 for ; Fri, 29 Mar 2013 18:20:19 +0000 (UTC) Received: (qmail 3077 invoked by uid 500); 29 Mar 2013 18:20:17 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 2966 invoked by uid 500); 29 Mar 2013 18:20:17 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 2906 invoked by uid 99); 29 Mar 2013 18:20:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Mar 2013 18:20:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 439678340B8; Fri, 29 Mar 2013 18:20:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: prachidamle@apache.org To: commits@cloudstack.apache.org Date: Fri, 29 Mar 2013 18:20:20 -0000 Message-Id: <46b7dec2d2144c37b7e718ad113a86df@git.apache.org> In-Reply-To: <249912a2528342cc981002e54fe8ed15@git.apache.org> References: <249912a2528342cc981002e54fe8ed15@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/50] [abbrv] git commit: updated refs/heads/affinity_groups to 857ed16 CLOUDSTACK-452: cloudstack UI - zone wizard - when Basic mode is selected, hide IPv6 DNS1, IPv6 DNS2 field. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5df32e6d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5df32e6d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5df32e6d Branch: refs/heads/affinity_groups Commit: 5df32e6d701a20057c25db2d9932edd91564febf Parents: e806ff6 Author: Jessica Wang Authored: Tue Mar 26 16:48:50 2013 -0700 Committer: Jessica Wang Committed: Tue Mar 26 16:48:50 2013 -0700 ---------------------------------------------------------------------- ui/scripts/zoneWizard.js | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5df32e6d/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 753b038..c09da8a 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -322,7 +322,9 @@ if (args.data['network-model'] == 'Basic') { args.$form.find('[rel=networkOfferingId]').show(); - args.$form.find('[rel=guestcidraddress]').hide(); + args.$form.find('[rel=guestcidraddress]').hide(); + args.$form.find('[rel=ip6dns1]').hide(); + args.$form.find('[rel=ip6dns2]').hide(); } else { //args.data['network-model'] == 'Advanced' args.$form.find('[rel=networkOfferingId]').hide(); @@ -331,7 +333,10 @@ 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(); + } setTimeout(function() { if ($form.find('input[name=ispublic]').is(':checked')) {