From 266f53895d4e47589ff3b37f5e9e8ca07d044aab Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 7 Mar 2014 15:00:47 +0000
Subject: [PATCH] BIS-668 / SP-1209: Better Support for upload/download files
with funny names on web apps
SVN: 30928
---
.../cisd/openbis/public/resources/uploader/js/src/upload.js | 4 ++--
.../1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/js/src/upload.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/js/src/upload.js
index 390192120f1..5e46fba8c94 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/js/src/upload.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/js/src/upload.js
@@ -168,7 +168,7 @@ var Uploader = new function () {
progress[id].xhr = xhr;
// pkupczyk: added sessionID
xhr.open("POST", settings.file_upload_url +
- "?filename=" + file.name +
+ "?filename=" + encodeURIComponent(file.name) +
"&id=" + id +
"&startByte=" + startByte +
"&endByte=" + endByte +
@@ -200,7 +200,7 @@ var Uploader = new function () {
// pkupczyk: changed download url
$("#filename-" + d.id).replaceWith("<a target=\"_blank\" " +
"href=\"" + settings.file_download_url + "?sessionID=" + settings.sessionID + "&filePath=" +
- d.filename + "\">" + d.filename + "</a>");
+ encodeURIComponent(d.filename) + "\">" + d.filename + "</a>");
$("#action-bar-" + d.id).remove();
delete progress[d.id];
settings.oncomplete(file);
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js
index 71fe24da03e..baaf678de30 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/DataSetViewer.js
@@ -167,8 +167,7 @@ function DataSetViewer(containerId, sample, serverFacade, datastoreDownloadURL)
.append($("<td>").html(dataset.code))
.append($("<td>").html(dataset.dataSetTypeCode));
- var downloadUrl = datastoreDownloadURL + '/' + dataset.code + "/" + datasetFiles[i].pathInDataSet + "?sessionID=" + this.serverFacade.getSession();
-
+ var downloadUrl = datastoreDownloadURL + '/' + dataset.code + "/" + encodeURIComponent(datasetFiles[i].pathInDataSet) + "?sessionID=" + this.serverFacade.getSession();
if(datasetFiles[i].isDirectory) {
$tableRow.append($("<td>").html(datasetFiles[i].pathInDataSet));
$tableRow.append($("<td>"));
--
GitLab