From bcb53ec363296be036afba78a56e08bd3c46e31c Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Fri, 5 Nov 2010 20:30:55 -0700
Subject: [PATCH] bug 7059: Fixing adding primary and secondary storage to use
 new api output.

---
 server/src/com/cloud/api/ApiSerializerHelper.java | 2 +-
 ui/scripts/cloud.core.pod.js                      | 2 +-
 ui/scripts/cloud.core.zone.js                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/api/ApiSerializerHelper.java b/server/src/com/cloud/api/ApiSerializerHelper.java
index be0e49e7834..e6f1c0bcc64 100644
--- a/server/src/com/cloud/api/ApiSerializerHelper.java
+++ b/server/src/com/cloud/api/ApiSerializerHelper.java
@@ -15,7 +15,7 @@ public class ApiSerializerHelper {
 	    	Gson gson = ApiGsonHelper.getBuilder().create();
 
 	    	if (result instanceof ResponseObject) {
-	            return clz.getName() + token + ((ResponseObject)result).getResponseName() + token + gson.toJson(result); 
+	            return clz.getName() + token + ((ResponseObject)result).getObjectName() + token + gson.toJson(result); 
 	    	} else {
 	            return clz.getName() + token + gson.toJson(result); 
 	    	}
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 19d3e8db188..ff064c2ef52 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -399,7 +399,7 @@ function initAddPrimaryStorageButton($midmenuAddLink2, currentPageInRightPanel)
 					        
 					        var $midmenuItem1 = $("#midmenu_item").clone();
                             $container.append($midmenuItem1.fadeIn("slow"));
-				            var item = json.createstoragepoolresponse;				            			      										   
+				            var item = json.createstoragepoolresponse.storagepool;				            			      										   
 					        primarystorageToMidmenu(item, $midmenuItem1);
 	                        bindClickToMidMenu($midmenuItem1, primarystorageToRightPanel, primarystorageGetMidmenuId);  
 	                    }
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 116b20a5627..388be00eb3f 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -457,7 +457,7 @@ function initAddSecondaryStorageButton($addButton) {
 				        $thisDialog.dialog("close");
 					
 					    var $subgridItem = $("#secondary_storage_tab_template").clone(true);	                        
-				        secondaryStorageJSONToTemplate(json.addsecondarystorageresponse.secondarystorage[0], $subgridItem);	
+				        secondaryStorageJSONToTemplate(json.addsecondarystorageresponse.secondarystorage, $subgridItem);	
 	                    $subgridItem.find("#after_action_info").text("Secondary storage was added successfully.");
                         $subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();  
                         $("#tab_content_secondarystorage").append($subgridItem.show());