cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/ui-vm-affinity to 66a16a1
Date Mon, 15 Apr 2013 20:01:26 GMT
Updated Branches:
  refs/heads/ui-vm-affinity 267568483 -> 66a16a1fd


'Change VM affinity' select UI: Pass data to action


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/66a16a1f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/66a16a1f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/66a16a1f

Branch: refs/heads/ui-vm-affinity
Commit: 66a16a1fd32bf864745d2404edd2386b8f1f648a
Parents: 2675684
Author: Brian Federle <brian.federle@citrix.com>
Authored: Mon Apr 15 13:01:23 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Mon Apr 15 13:01:23 2013 -0700

----------------------------------------------------------------------
 ui/scripts/instances.js          |    6 +++---
 ui/scripts/ui-custom/affinity.js |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66a16a1f/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6273a78..e360dbe 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -645,9 +645,9 @@
                     dataProvider: function(args) {
                       args.response.success({
                         data: [
-                          { name: 'Affinity Group 1', type: 'Affinity' },
-                          { name: 'Affinity Group 2', type: 'Anti-affinity' },
-                          { name: 'Anti-affinity Group', type: 'Anti-affinity' }
+                          { id: 1, name: 'Affinity Group 1', type: 'Affinity' },
+                          { id: 2, name: 'Affinity Group 2', type: 'Anti-affinity' },
+                          { id: 3, name: 'Anti-affinity Group', type: 'Anti-affinity' }
                         ]
                       });
                     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66a16a1f/ui/scripts/ui-custom/affinity.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/affinity.js b/ui/scripts/ui-custom/affinity.js
index 1a1eb55..281ea2f 100644
--- a/ui/scripts/ui-custom/affinity.js
+++ b/ui/scripts/ui-custom/affinity.js
@@ -97,9 +97,9 @@
                   tierID: $dataList.find('.tier-select select').val(),
                   _subselect: $dataList.find('tr.multi-edit-selected .subselect select').val(),
                   context: $.extend(true, {}, context, {
-                    instances: [
-                      $dataList.find('tr.multi-edit-selected').data('json-obj')
-                    ]
+                    affinityGroups: $dataList.find('tr.multi-edit-selected').map(function(index,
elem) {
+                      return $(elem).data('json-obj');
+                    })
                   }),
                   response: {
                     success: function(args) {


Mime
View raw message