CLOUDSTACK-2074: cloudstack UI - Affinity - Instances page - implement "View Affinity Groups" drilldown.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c98696d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c98696d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c98696d Branch: refs/heads/master Commit: 6c98696d8ca0825dcfcd07d9381682e26f0325ce Parents: 7f6e7c6 Author: Jessica Wang <[email protected]> Authored: Thu Apr 18 17:31:29 2013 -0700 Committer: Jessica Wang <[email protected]> Committed: Thu Apr 18 17:31:29 2013 -0700 ---------------------------------------------------------------------- ui/scripts/affinity.js | 9 +++++++++ ui/scripts/instances.js | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c98696d/ui/scripts/affinity.js ---------------------------------------------------------------------- diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js index d59d129..e6e8e34 100644 --- a/ui/scripts/affinity.js +++ b/ui/scripts/affinity.js @@ -24,8 +24,17 @@ type: { label: 'label.type' } }, dataProvider: function(args) { + var data = {}; + if (args.context != null) { + if ("instances" in args.context) { + $.extend(data, { + virtualmachineid: args.context.instances[0].id + }); + } + } $.ajax({ url: createURL('listAffinityGroups'), + data: data, success: function(json) { var items = json.listaffinitygroupsresponse.affinitygroup; args.response.success({data: items}); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c98696d/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 03153a1..03656e2 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -284,6 +284,7 @@ viewAll: [ { path: 'storage.volumes', label: 'label.volumes' }, { path: 'vmsnapshots', label: 'label.snapshots' }, + { path: 'affinityGroups', label: 'label.affinity.groups' }, { path: '_zone.hosts', label: 'label.hosts',
