cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 02399d9
Date Wed, 12 Jun 2013 17:56:47 GMT
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 <jessicawang@apache.org>
Authored: Wed Jun 12 10:55:06 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
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 = [];												


Mime
View raw message