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 0C17911F2C for ; Tue, 8 Apr 2014 22:37:03 +0000 (UTC) Received: (qmail 92929 invoked by uid 500); 8 Apr 2014 22:37:02 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 92712 invoked by uid 500); 8 Apr 2014 22:37:00 -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 92703 invoked by uid 99); 8 Apr 2014 22:36:59 -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, 08 Apr 2014 22:36:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C260994EC58; Tue, 8 Apr 2014 22:36:58 +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: <2c87981834a5461a8e936b0a2a9c5d90@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4 to a512b78 Date: Tue, 8 Apr 2014 22:36:58 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4 68cf2ba0e -> a512b7847 CLOUDSTACK-6342: UI - Load Balancing page - LB rules - VM + IP Address - fix a bug that vmidipmap was not sent to API. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a512b784 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a512b784 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a512b784 Branch: refs/heads/4.4 Commit: a512b7847ab4d4b21a3d96d0151233c06a752d62 Parents: 68cf2ba Author: Jessica Wang Authored: Tue Apr 8 15:36:38 2014 -0700 Committer: Jessica Wang Committed: Tue Apr 8 15:36:49 2014 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a512b784/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 660838b..0276684 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3736,14 +3736,24 @@ add: { label: 'label.add.vms.to.lb', action: function(args) { + var inputData = { + id: args.multiRule.id + }; + if (args.data != null) { + for (var k = 0; k < args.data.length; k++) { + inputData['vmidipmap[' + k + '].vmid'] = args.data[k].id; + + if (args.context.ipAddresses[0].isportable) { + inputData['vmidipmap[' + k + '].vmip'] = args.data[k]._subselect.split(',')[1]; + } else { + inputData['vmidipmap[' + k + '].vmip'] = args.data[k]._subselect; + } + } + } + $.ajax({ url: createURL('assignToLoadBalancerRule'), - data: { - id: args.multiRule.id, - virtualmachineids: $.map(args.data, function(elem) { - return elem.id; - }).join(',') - }, + data: inputData, success: function(json) { args.response.success({ notification: { @@ -3783,10 +3793,7 @@ $.ajax({ url: createURL('removeFromLoadBalancerRule'), - data: { - id: args.multiRule.id, - virtualmachineids: args.item.id - }, + data: inputData, success: function(json) { args.response.success({ notification: {