You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/04/18 02:44:43 UTC

git commit: updated refs/heads/ui-vm-affinity to b203e6c

Updated Branches:
  refs/heads/ui-vm-affinity 9827d79fb -> b203e6cbf


CLOUDSTACK-2074: cloudstack UI - Affinity - VM Wizard - populate Affinity step.


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

Branch: refs/heads/ui-vm-affinity
Commit: b203e6cbf04dbc49dc58e4bf17848544718101fa
Parents: 9827d79
Author: Jessica Wang <je...@citrix.com>
Authored: Wed Apr 17 17:43:59 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Wed Apr 17 17:43:59 2013 -0700

----------------------------------------------------------------------
 ui/scripts/instanceWizard.js |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b203e6cb/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 2013cb4..43c2757 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -313,15 +313,14 @@
       },
 
       // Step 5: Affinity
-      function(args) {
-        args.response.success({
-          data: {
-            affinityGroups: [
-              { id: 1, name: 'affinity1', description: 'Dummy Affinity Group 1' },
-              { id: 2, name: 'affinity2', description: 'Dummy Affinity Group 2' },
-            ]
-          }
-        });
+      function(args) {			  
+				$.ajax({
+				  url: createURL('listAffinityGroups'),
+					success: function(json) {					 
+					  var items = json.listaffinitygroupsresponse.affinitygroup;
+						args.response.success({data: {affinityGroups: items}});
+					}
+				});		
       },
 
       // Step 6: Network