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 DEED410B8A for ; Wed, 12 Jun 2013 17:56:48 +0000 (UTC) Received: (qmail 49857 invoked by uid 500); 12 Jun 2013 17:56:48 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 49681 invoked by uid 500); 12 Jun 2013 17:56:48 -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 49674 invoked by uid 99); 12 Jun 2013 17:56:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jun 2013 17:56:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D46AE8A3BB3; Wed, 12 Jun 2013 17:56:47 +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: <4644754d68cd4f12b0d59d3d9ec43456@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 02399d9 Date: Wed, 12 Jun 2013 17:56:47 +0000 (UTC) Updated Branches: refs/heads/master 862b95505 -> 02399d9a2 CLOUDSTACK-2350: UI - Instances menu - change affinity action - list affinity groups that belongs to instance owner. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/02399d9a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/02399d9a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/02399d9a Branch: refs/heads/master Commit: 02399d9a2a2dd3b960b676a1ac435fb4bca14778 Parents: 862b955 Author: Jessica Wang Authored: Wed Jun 12 10:55:06 2013 -0700 Committer: Jessica Wang Committed: Wed Jun 12 10:56:39 2013 -0700 ---------------------------------------------------------------------- ui/scripts/instances.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/02399d9a/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 33a5767..da36de7 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -640,9 +640,14 @@ name: { label: 'label.name' }, type: { label: 'label.type' } }, - dataProvider: function(args) { + dataProvider: function(args) { + var data = { + domainid: args.context.instances[0].domainid, + account: args.context.instances[0].account + }; $.ajax({ url: createURL('listAffinityGroups'), + data: data, async: false, //make it sync to avoid dataProvider() being called twice which produces duplicate data success: function(json) { var items = [];