cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to cb84e84
Date Fri, 21 Jun 2013 22:09:35 GMT
Updated Branches:
  refs/heads/master 9e2026a2e -> cb84e8404


CLOUDSTACK-3123: UI > Infrastructure menu > Secondary Storage > Cache Storage: implement
detailView.


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

Branch: refs/heads/master
Commit: cb84e8404d758975c9c3e87fc11b20a4cf54928d
Parents: 9e2026a
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Jun 21 15:08:36 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Jun 21 15:09:26 2013 -0700

----------------------------------------------------------------------
 ui/scripts/system.js | 75 +++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb84e840/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 839d4e2..9df13db 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6870,27 +6870,20 @@
                               args.response.error(parseXMLHttpResponse(json));
                             }
                           });
-                        },
+                        }
+                
+                        /*
+                        ,
                         detailView: {
-                          updateContext: function (args) {
-                            var zone;
-
-                            $.ajax({
-                              url: createURL('listZones'),
-                              data: { id: args.context.secondarystorages[0].zoneid },
-                              async: false,
-                              success: function (json) {
-                                zone = json.listzonesresponse.zone[0];
-                              }
-                            });
-
-                            selectedZoneObj = zone;
-
+                          updateContext: function (args) {                            
                             return {
-                              zones: [zone]
+                              zones: [{}]
                             };
+                            
                           }
                         }
+                        */
+                
                       }                      
                     },
                     cacheStorage: {
@@ -6914,27 +6907,19 @@
                               args.response.error(parseXMLHttpResponse(json));
                             }
                           });
-                        },
+                        }
+                    
+                        /*
+                        ,
                         detailView: {
-                          updateContext: function (args) {
-                            var zone;
-
-                            $.ajax({
-                              url: createURL('listZones'),
-                              data: { id: args.context.secondarystorages[0].zoneid },
-                              async: false,
-                              success: function (json) {
-                                zone = json.listzonesresponse.zone[0];
-                              }
-                            });
-
-                            selectedZoneObj = zone;
-
+                          updateContext: function (args) {                            
                             return {
-                              zones: [zone]
+                              zones: [{}]
                             };
                           }
                         }
+                        */
+                    
                       }                      
                     }
                   }
@@ -13378,9 +13363,9 @@
                       }
                     ],
 
-                    dataProvider: function(args) {
+                    dataProvider: function(args) {                      
                       $.ajax({
-                        url: createURL("listImageStores&id=" + args.context.secondarystorages[0].id),
+                        url: createURL("listImageStores&id=" + args.context.secondaryStorage[0].id),
                         dataType: "json",
                         async: true,
                         success: function(json) {
@@ -13597,19 +13582,19 @@
                       }
                     ],
 
-                    dataProvider: function(args) {
+                    dataProvider: function(args) {                                
                       $.ajax({
-                        url: createURL("listImageStores&id=" + args.context.secondarystorages[0].id),
-                        dataType: "json",
-                        async: true,
-                        success: function(json) {
-                          var item = json.listimagestoreresponse.imagestore[0];
-                          args.response.success({
-                            actionFilter: secondarystorageActionfilter,
-                            data:item
-                          });
+                        url: createURL('listCacheStores'),
+                        data: { 
+                          id: args.context.cacheStorage[0].id
+                        },
+                        async: false,
+                        success: function (json) {                          
+                          var item = json.listcachestoreresponse.imagestore[0];         
                
+                          args.response.success({ data: item });
+                          
                         }
-                      });
+                      });                      
                     }
                   }
 


Mime
View raw message