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 D984910610 for ; Mon, 10 Jun 2013 00:53:55 +0000 (UTC) Received: (qmail 56738 invoked by uid 500); 10 Jun 2013 00:53:51 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 56678 invoked by uid 500); 10 Jun 2013 00:53:51 -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 56210 invoked by uid 99); 10 Jun 2013 00:53:50 -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, 10 Jun 2013 00:53:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CA8C28A209E; Mon, 10 Jun 2013 00:53:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: commits@cloudstack.apache.org Date: Mon, 10 Jun 2013 00:54:15 -0000 Message-Id: <790e4ecf21a1440baae166568bf13a70@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [26/50] [abbrv] git commit: updated refs/heads/vmsync to aaa16af CLOUDSTACK-747: Internal LB detailView - Assigned VMs tab - Assign VMs action - Select VM view - refresh assignedVMs data by API call when popping up Select VM view. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/55417858 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/55417858 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/55417858 Branch: refs/heads/vmsync Commit: 554178582709e51ef934fa2684b281e83f3a3ed5 Parents: f61d61d Author: Jessica Wang Authored: Thu Jun 6 16:04:31 2013 -0700 Committer: Jessica Wang Committed: Thu Jun 6 16:07:49 2013 -0700 ---------------------------------------------------------------------- ui/scripts/vpc.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55417858/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index a087baa..399699d 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -651,7 +651,21 @@ listView: $.extend(true, {}, cloudStack.sections.instances.listView, { type: 'checkbox', filters: false, - dataProvider: function(args) { + dataProvider: function(args) { + var assignedInstances; + $.ajax({ + url: createURL('listLoadBalancers'), + data: { + id: args.context.internalLoadBalancers[0].id + }, + async: false, + success: function(json) { + assignedInstances = json.listloadbalancerssresponse.loadbalancer[0].loadbalancerinstance; + if(assignedInstances == null) + assignedInstances = []; + } + }); + $.ajax({ url: createURL('listVirtualMachines'), data: { @@ -663,11 +677,9 @@ // Pre-select existing instances in LB rule $(instances).map(function(index, instance) { - instance._isSelected = $.grep( - args.context.internalLoadBalancers[0].loadbalancerinstance, - - function(lbInstance) { - return lbInstance.id == instance.id; + instance._isSelected = $.grep(assignedInstances, + function(assignedInstance) { + return assignedInstance.id == instance.id; } ).length ? true : false; });