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 6B065F20D for ; Tue, 9 Apr 2013 13:21:13 +0000 (UTC) Received: (qmail 94958 invoked by uid 500); 9 Apr 2013 13:21:01 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 94633 invoked by uid 500); 9 Apr 2013 13:20:54 -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 91370 invoked by uid 99); 9 Apr 2013 13:20:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Apr 2013 13:20:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A63F1817394; Tue, 9 Apr 2013 13:20:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Tue, 09 Apr 2013 13:20:58 -0000 Message-Id: <178b507e10cd498098f0f77161c2e685@git.apache.org> In-Reply-To: <06e2d3e745e44030b768d209fb51bfd3@git.apache.org> References: <06e2d3e745e44030b768d209fb51bfd3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/50] [abbrv] git commit: updated refs/heads/marvin_refactor to 2a99064 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/3e88a43d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e88a43d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e88a43d Branch: refs/heads/marvin_refactor Commit: 3e88a43d0feae46e05e685238c6ef0454be529d5 Parents: 48cd9cc Author: Jessica Wang Authored: Tue Mar 26 16:48:50 2013 -0700 Committer: Prasanna Santhanam Committed: Sun Mar 31 22:05:41 2013 +0530 ---------------------------------------------------------------------- ui/scripts/zoneWizard.js | 38 +++++++++++--------------------------- 1 files changed, 11 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e88a43d/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index a64c86a..53f1684 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -322,7 +322,7 @@ 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(); } @@ -333,10 +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')) { @@ -1185,32 +1185,16 @@ scope: { label: 'label.scope', select: function(args) { - - var selectedHypervisorObj = { - hypervisortype: $.isArray(args.context.zones[0].hypervisor) ? - // We want the cluster's hypervisor type - args.context.zones[0].hypervisor[1] : args.context.zones[0].hypervisor - }; - if(selectedHypervisorObj == null) { - return; - } - - // ZWPS is supported only for KVM as the hypervisor - if(selectedHypervisorObj.hypervisortype != "KVM"){ - var scope=[]; - scope.push({ id: 'cluster', description: _l('label.cluster') }); - scope.push({ id: 'host', description: _l('label.host') }); - args.response.success({data: scope}); - } + var scope = [ + { id: 'zone', description: _l('label.zone.wide') }, + { id: 'cluster', description: _l('label.cluster') }, + { id: 'host', description: _l('label.host') } + ]; - else { - var scope=[]; - scope.push({ id: 'zone', description: _l('label.zone.wide') }); - scope.push({ id: 'cluster', description: _l('label.cluster') }); - scope.push({ id: 'host', description: _l('label.host') }); - args.response.success({data: scope}); - } + args.response.success({ + data: scope + }); }