cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From isaacchi...@apache.org
Subject git commit: updated refs/heads/master to 452176c
Date Tue, 30 Jul 2013 11:21:55 GMT
Updated Branches:
  refs/heads/master dafc59e78 -> 452176c0b


CLOUDSTACK-3935:Inconsistent json object name for image store api


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

Branch: refs/heads/master
Commit: 452176c0b43c9122e73f89d6ccd86cb36823ec68
Parents: dafc59e
Author: Isaac Chiang <isaacchiang@gmail.com>
Authored: Tue Jul 30 18:59:35 2013 +0800
Committer: Isaac Chiang <isaacchiang@gmail.com>
Committed: Tue Jul 30 19:20:56 2013 +0800

----------------------------------------------------------------------
 .../api/command/admin/storage/AddImageStoreCmd.java     |  2 +-
 .../api/command/admin/storage/ListImageStoresCmd.java   |  2 +-
 ui/scripts/system.js                                    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/452176c0/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
index 1e383c9..7e44098 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
@@ -141,7 +141,7 @@ public class AddImageStoreCmd extends BaseCmd {
             if (result != null ) {
                     storeResponse = _responseGenerator.createImageStoreResponse(result);
                     storeResponse.setResponseName(getCommandName());
-                    storeResponse.setObjectName("secondarystorage");
+                    storeResponse.setObjectName("imagestore");
                     this.setResponseObject(storeResponse);
             } else {
                 throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add
secondary storage");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/452176c0/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
index 7063e6c..97fc6fb 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
@@ -29,7 +29,7 @@ import org.apache.log4j.Logger;
 public class ListImageStoresCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListImageStoresCmd.class.getName());
 
-    private static final String s_name = "listimagestoreresponse";
+    private static final String s_name = "listimagestoresresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/452176c0/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 50cffb3..f25f461 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -291,7 +291,7 @@
                             data: data2,
                             success: function(json) {
                                 dataFns.systemVmCount($.extend(data, {
-                                    secondaryStorageCount: json.listimagestoreresponse.imagestore
? json.listimagestoreresponse.count : 0
+                                    secondaryStorageCount: json.listimagestoresresponse.imagestore
? json.listimagestoresresponse.count : 0
                                 }));
                             }
                         });
@@ -7336,7 +7336,7 @@
                                                         data: data,
                                                         success: function(json) {
                                                             args.response.success({
-                                                                data: json.listimagestoreresponse.imagestore
+                                                                data: json.listimagestoresresponse.imagestore
                                                             });
                                                         },
                                                         error: function(json) {
@@ -14794,7 +14794,7 @@
                                                 url: createURL('addImageStore'),
                                                 data: data,
                                                 success: function(json) {
-                                                    var item = json.addimagestoreresponse.secondarystorage;
+                                                    var item = json.addimagestoreresponse.imagestore;
                                                     args.response.success({
                                                         data: item
                                                     });
@@ -14844,7 +14844,7 @@
                                                 data: data,
                                                 success: function(json) {
                                                     havingS3 = true;
-                                                    var item = json.addimagestoreresponse.secondarystorage;
+                                                    var item = json.addimagestoreresponse.imagestore;
                                                     args.response.success({
                                                         data: item
                                                     });
@@ -14904,7 +14904,7 @@
                                                 data: data,
                                                 success: function(json) {
                                                     havingSwift = true;
-                                                    var item = json.addimagestoreresponse.secondarystorage;
+                                                    var item = json.addimagestoreresponse.imagestore;
                                                     args.response.success({
                                                         data: item
                                                     });
@@ -15014,7 +15014,7 @@
                                                 dataType: "json",
                                                 async: true,
                                                 success: function(json) {
-                                                    var item = json.listimagestoreresponse.imagestore[0];
+                                                    var item = json.listimagestoresresponse.imagestore[0];
                                                     args.response.success({
                                                         actionFilter: secondarystorageActionfilter,
                                                         data: item


Mime
View raw message