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 DB8461049D for ; Mon, 16 Sep 2013 09:11:43 +0000 (UTC) Received: (qmail 33736 invoked by uid 500); 16 Sep 2013 09:11:13 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 33688 invoked by uid 500); 16 Sep 2013 09:11:12 -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 32432 invoked by uid 99); 16 Sep 2013 09:11:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Sep 2013 09:11:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B30D190563C; Mon, 16 Sep 2013 09:11:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Mon, 16 Sep 2013 09:11:32 -0000 Message-Id: In-Reply-To: <734a2c281f734629af53032b1d154841@git.apache.org> References: <734a2c281f734629af53032b1d154841@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/50] [abbrv] git commit: updated refs/heads/kvm-vnc-listen to 895c51d CLOUDSTACK-4662: UI > Network > IP Address > select a portable IP Address > Port Forwarding > VM grid - select a VM - dropdown of VM NIC IP appears - dropdown option value is networkID + VmGuestIp, split it and pass only VmGuestIp to API call. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2e2d1ace Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e2d1ace Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e2d1ace Branch: refs/heads/kvm-vnc-listen Commit: 2e2d1acefc89e157539fe2b2e3b846848dc1e427 Parents: 1042136 Author: Jessica Wang Authored: Thu Sep 12 19:11:13 2013 -0700 Committer: Jessica Wang Committed: Thu Sep 12 19:21:57 2013 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e2d1ace/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 0afa360..a09e565 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3842,10 +3842,20 @@ virtualmachineid: args.itemData[0].id, openfirewall: false }; + + if (args.context.ipAddresses[0].isportable) { + var subselect = args.itemData[0]._subselect.split(','); + //var networkid = subselect[0]; + var vmguestip = subselect[1]; - if (args.itemData[0]._subselect && args.itemData[0]._subselect != -1) { + //data.networkid = networkid; + + if (parseInt(vmguestip) !== -1) { + data.vmguestip = vmguestip; + } + } else if (args.itemData[0]._subselect && args.itemData[0]._subselect != -1) { data.vmguestip = args.itemData[0]._subselect; - } + } if ('vpc' in args.context) { //from VPC section if (args.data.tier == null) {