From 87df47cb6d666fc63b8709936ec067117876de4a Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 20 Dec 2010 18:46:46 -0800
Subject: [PATCH] bug 7547: template page, ISO page, volume page - decode URL
 returned from extractTemplate/extractISO/extractVolume API.

---
 ui/scripts/cloud.core.iso.js      | 2 +-
 ui/scripts/cloud.core.template.js | 2 +-
 ui/scripts/cloud.core.volume.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 6c0783725e2..151134c2703 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -697,7 +697,7 @@ function doDownloadISO($actionLink, $detailsTab, $midmenuItem1) {
 		                        if (result.jobstatus == 1) { // Succeeded 			                            
 		                            $infoContainer.removeClass("error");
 		                            $infoContainer.find("#icon,#info").removeClass("error");		                      
-		                            var url = fromdb(json.queryasyncjobresultresponse.jobresult.iso.url);	
+		                            var url = decodeURIComponent(json.queryasyncjobresultresponse.jobresult.iso.url);	
 		                            var htmlMsg = "Please click <a href='" + url + "'>" + url + "</a>" + " to download ISO";                          
 		                            $infoContainer.find("#info").html(htmlMsg);
 		                            $infoContainer.show();		                        
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index 6efe3e5af55..d70067ed541 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -718,7 +718,7 @@ function doDownloadTemplate($actionLink, $detailsTab, $midmenuItem1) {
 		                        if (result.jobstatus == 1) { // Succeeded 		
 		                            $infoContainer.removeClass("error");
 		                            $infoContainer.find("#icon,#info").removeClass("error");
-		                            var url = fromdb(json.queryasyncjobresultresponse.jobresult.template.url);	
+		                            var url = decodeURIComponent(json.queryasyncjobresultresponse.jobresult.template.url);	
 		                            var htmlMsg = "Please click <a href='" + url + "'>" + url + "</a>" + " to download template";                          
 		                            $infoContainer.find("#info").html(htmlMsg);
 		                            $infoContainer.show();		                        
diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js
index 2c2fcc0c824..9b09b3925d6 100644
--- a/ui/scripts/cloud.core.volume.js
+++ b/ui/scripts/cloud.core.volume.js
@@ -597,7 +597,7 @@ function doDownloadVolume($actionLink, $detailsTab, $midmenuItem1) {
 		                        if (result.jobstatus == 1) { // Succeeded 			                            
 		                            $infoContainer.removeClass("error");
 		                            $infoContainer.find("#icon,#info").removeClass("error");		                      
-		                            var url = fromdb(json.queryasyncjobresultresponse.jobresult.volume.url);	
+		                            var url = decodeURIComponent(json.queryasyncjobresultresponse.jobresult.volume.url);	
 		                            var htmlMsg = "Please click <a href='" + url + "'>" + url + "</a>" + " to download volume";                          
 		                            $infoContainer.find("#info").html(htmlMsg);
 		                            $infoContainer.show();