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 8148E10889 for ; Fri, 18 Oct 2013 18:57:21 +0000 (UTC) Received: (qmail 45397 invoked by uid 500); 18 Oct 2013 18:57:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 45380 invoked by uid 500); 18 Oct 2013 18:57:19 -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 45355 invoked by uid 99); 18 Oct 2013 18:57:16 -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, 18 Oct 2013 18:57:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3DF3E36784; Fri, 18 Oct 2013 18:57:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: <8703f8b5872b494c9d35735692ddea6b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to ebd4b8f Date: Fri, 18 Oct 2013 18:57:16 +0000 (UTC) Updated Branches: refs/heads/master a99694b82 -> ebd4b8fa9 cloudstack UI: IP Addresses page > change logic of hiding/showing Acquire New IP button since args.context does contain networks property even it's from VPC section. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ebd4b8fa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ebd4b8fa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ebd4b8fa Branch: refs/heads/master Commit: ebd4b8fa9f77be01f1eb156d496c3b7ad60abed5 Parents: a99694b Author: Jessica Wang Authored: Fri Oct 18 11:56:07 2013 -0700 Committer: Jessica Wang Committed: Fri Oct 18 11:57:01 2013 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebd4b8fa/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 80ddbcb..78f788b 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1952,7 +1952,7 @@ } //*** from Guest Network section *** - if ('networks' in args.context) { + if (!('vpc' in args.context)) { if (args.context.networks[0].vpcid == null) { //Guest Network section > non-VPC network, show Acquire IP button return true; } else { //Guest Network section > VPC network, hide Acquire IP button @@ -1960,7 +1960,7 @@ } } //*** from VPC section *** - else { //'vpc' in args.context + else { //'vpc' in args.context //args.context.networks[0] has only one property => name: 'Router' return true; //VPC section, show Acquire IP button } },