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/12/17 23:17:06 UTC

git commit: updated refs/heads/master to a71915c

Updated Branches:
  refs/heads/master 95364a402 -> a71915c03


CLOUDSTACK-5486: UI > tags > listXXXXXXX API now returns tags property. So, use tags property in embedded object returned by listXXXXXXX API to populate tags in detailView in all pages (instead of calling extra API listTags).


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

Branch: refs/heads/master
Commit: a71915c034235928b2dd7d0593f0614b74084625
Parents: 95364a4
Author: Jessica Wang <je...@apache.org>
Authored: Tue Dec 17 14:16:08 2013 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Tue Dec 17 14:16:55 2013 -0800

----------------------------------------------------------------------
 ui/scripts/sharedFunctions.js | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a71915c0/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 2425c5b..66eaf7a 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -2066,6 +2066,11 @@ cloudStack.api = {
                 }
             },
             dataProvider: function(args) {
+            	args.response.success({
+                    data: args.jsonObj.tags
+                });
+            	
+            	/*
                 var resourceId = args.context[contextId][0].id;
                 var data = {
                     resourceId: resourceId,
@@ -2096,6 +2101,7 @@ cloudStack.api = {
                         args.response.error(parseXMLHttpResponse(json));
                     }
                 });
+                */
             }
         };
     }