You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/07/24 21:25:04 UTC
[6/7] git commit: Pass projectId to listTags,
when viewing a project resource
Pass projectId to listTags, when viewing a project resource
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7a2be05c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7a2be05c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7a2be05c
Branch: refs/heads/master
Commit: 7a2be05c245a50dfab9a1df27969ef146b435dc1
Parents: 8e1b8d1
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jul 24 11:16:43 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jul 24 12:23:57 2012 -0700
----------------------------------------------------------------------
ui/scripts/sharedFunctions.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7a2be05c/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 55d014b..535df56 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -675,14 +675,18 @@ cloudStack.api = {
},
dataProvider: function(args) {
var resourceId = args.context[contextId][0].id;
+ var data = {
+ resourceId: resourceId,
+ resourceType: resourceType
+ };
+
+ if (args.context.projects) {
+ data.projectid=args.context.projects[0].id;
+ }
$.ajax({
url: createURL('listTags'),
- data: {
- listAll: true,
- resourceId: resourceId,
- resourceType: resourceType
- },
+ data: data,
success: function(json) {
args.response.success({
data: json.listtagsresponse ?