TAGS feature implementation throughout CloudStack UI

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

Branch: refs/heads/vpc
Commit: ab6ef4bcebafaae66bf18e84457b5cce3fc162cc
Parents: 2ec005c
Author: Pranav Saxena <[email protected]>
Authored: Wed Jul 25 03:11:30 2012 +0530
Committer: Brian Federle <[email protected]>
Committed: Tue Jul 24 15:07:43 2012 -0700

----------------------------------------------------------------------
 ui/scripts/instances.js |    2 ++
 ui/scripts/network.js   |    9 +++++++++
 ui/scripts/storage.js   |    5 +++++
 ui/scripts/templates.js |   12 +++++++++---
 4 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ab6ef4bc/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 15c8efc..bca405b 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1150,6 +1150,8 @@
                                                                id: { label: 
'label.id' }
               }
             ],
+            
+            tags: cloudStack.api.tags({ resourceType: 'UserVm', contextId: 
'instances' }),
 
             dataProvider: function(args) {                                     
         
                                                        $.ajax({

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ab6ef4bc/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 96446df..cbfa4ec 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -757,6 +757,10 @@
                     account: { label: 'label.account' }
                   }
                 ],
+
+                tags: cloudStack.api.tags({ resourceType: 'Network', 
contextId: 'networks' }),
+
+                
                 dataProvider: function(args) {                                 
                                                                
                                                                  $.ajax({
                                                                                
url: createURL("listNetworks&id=" + args.context.networks[0].id + 
"&listAll=true"), //pass "&listAll=true" to "listNetworks&id=xxxxxxxx" for now 
before API gets fixed.
@@ -1472,6 +1476,8 @@
                     vlanname: { label: 'label.vlan' }
                   }
                 ],
+ 
+                tags: cloudStack.api.tags({ resourceType: 'PublicIpAddress', 
contextId: 'ipAddresses' }),
 
                 dataProvider: function(args) {
                   var items = args.context.ipAddresses;
@@ -2782,6 +2788,9 @@
                   }
                 ],
 
+                tags: cloudStack.api.tags({ resourceType: 'SecurityGroup', 
contextId: 'securityGroups' }),
+
+
                 dataProvider: function(args) {
                   $.ajax({
                     url: createURL("listSecurityGroups&id="+args.id),

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ab6ef4bc/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index c0ac3b2..01901d3 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1004,6 +1004,9 @@
                   }
                 ],
 
+                tags: cloudStack.api.tags({ resourceType: 'Volume', contextId: 
'volumes' }),
+
+
                 dataProvider: function(args) {         
                                                                  $.ajax({
                                                                                
url: createURL("listVolumes&id=" + args.context.volumes[0].id),
@@ -1269,6 +1272,8 @@
                   }
                 ],
 
+                tags: cloudStack.api.tags({ resourceType: 'Snapshot', 
contextId: 'snapshots' }),
+
                 dataProvider: function(args) {
                                                                  $.ajax({
                                                                                
url: createURL("listSnapshots&id=" + args.context.snapshots[0].id),

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ab6ef4bc/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 811a27a..7a99d79 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -678,9 +678,12 @@
                     account: { label: 'label.account' },
                     created: { label: 'label.created', converter: 
cloudStack.converters.toLocalDate }
                   }
-                ],
+                 ],
+         
+               tags: cloudStack.api.tags({ resourceType: 'Template', 
contextId: 'templates' }),
+ 
 
-                dataProvider: function(args) {
+               dataProvider: function(args) {
                   var jsonObj = args.context.templates[0];
                   var apiCmd = "listTemplates&templatefilter=self&id=" + 
jsonObj.id;
                   if(jsonObj.zoneid != null)
@@ -822,6 +825,7 @@
                   }
                 }
               },
+             
 
               action: function(args) {
                 var array1 = [];
@@ -1192,8 +1196,10 @@
                     created: { label: 'label.created', converter: 
cloudStack.converters.toLocalDate }
                   }
                 ],
+                  
+                 tags: cloudStack.api.tags({ resourceType: 'ISO', contextId: 
'isos' }),
 
-                dataProvider: function(args) {
+                 dataProvider: function(args) {
                   var jsonObj = args.context.isos[0];
                   var apiCmd = "listIsos&isofilter=self&id="+jsonObj.id;
                   if(jsonObj.zoneid != null)

Reply via email to