gCubeSystem
/
workspace-widget-portlet
15
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Bug #21794 fixed, folder names were not URI encoded

This commit is contained in:
Massimiliano Assante 2021-07-13 11:32:48 +02:00
parent fa373c0ff7
commit 0acb08f4ba
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,9 +4,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v1.5.1] - 2021-05-25 ## [v1.5.1-SNAPSHOT] - 2021-05-25
- Feature #21507 support new UMATokensProvider class - Feature #21507 support new UMATokensProvider class
- Bug #21794 folder names were not URI encoded
## [v1.5.0] - 2021-04-06 ## [v1.5.0] - 2021-04-06

2
pom.xml
View File

@ -13,7 +13,7 @@
<artifactId>workspace-widget-portlet</artifactId> <artifactId>workspace-widget-portlet</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>workspace-widget-portlet Portlet</name> <name>workspace-widget-portlet Portlet</name>
<version>1.5.1</version> <version>1.5.1-SNAPSHOT</version>
<description> <description>
Workspace Widget Portlet is a small Front-end component looking like G Drive which exposes the content of the user's workspace or VRE Folders in read only mode. Workspace Widget Portlet is a small Front-end component looking like G Drive which exposes the content of the user's workspace or VRE Folders in read only mode.
</description> </description>

5
src/main/java/org/gcube/portlets/user/wswidget/WorkspaceWidget.java
View File

@ -104,9 +104,7 @@ public class WorkspaceWidget extends MVCPortlet {
} catch (StorageHubException e) { } catch (StorageHubException e) {
e.printStackTrace(); e.printStackTrace();
} }
if (! (item instanceof ExternalURL || item instanceof ExternalLink)) { if (! (item instanceof ExternalURL || item instanceof ExternalLink)) {
ServletResponseUtil.sendFile(httpReq,httpRes, streamDescr.getFileName(), streamDescr.getStream(), "application/download"); ServletResponseUtil.sendFile(httpReq,httpRes, streamDescr.getFileName(), streamDescr.getStream(), "application/download");
streamDescr.getStream().close(); streamDescr.getStream().close();
} }
@ -116,6 +114,7 @@ public class WorkspaceWidget extends MVCPortlet {
String cmd = ParamUtil.getString(resourceRequest, "cmd", ""); String cmd = ParamUtil.getString(resourceRequest, "cmd", "");
String selectedItemId = "root"; String selectedItemId = "root";
String selectedItemName = ""; String selectedItemName = "";
System.out.println("****\n\n\n*** String cmd2 ="+cmd);
if (cmd != null && cmd.split("_selectedName").length > 1) { if (cmd != null && cmd.split("_selectedName").length > 1) {
String[] splits = cmd.split("_selectedName"); String[] splits = cmd.split("_selectedName");
selectedItemId = splits[0].split("=")[1]; selectedItemId = splits[0].split("=")[1];

4
src/main/webapp/html/workspacewidget/view.jsp
View File

@ -91,7 +91,7 @@ $.fn.dataTable.ext.errMode = 'none';
function loadItemsListIntoTable(itemId, itemName, hideVreFolders) { function loadItemsListIntoTable(itemId, itemName, hideVreFolders) {
var table = $('#userTable').DataTable(); var table = $('#userTable').DataTable();
table.ajax.url('<%=usersCustomDataSourceURL%>'+itemId+'_selectedName='+itemName).load(); table.ajax.url('<%=usersCustomDataSourceURL%>'+itemId+'_selectedName='+encodeURIComponent(itemName)).load();
if (hideVreFolders) { if (hideVreFolders) {
$('#vreFoldersDiv').hide(); $('#vreFoldersDiv').hide();
} else { } else {
@ -103,7 +103,7 @@ function loadItemsListIntoTable(itemId, itemName, hideVreFolders) {
function loadRecentItemsListIntoTable(itemId, itemName) { function loadRecentItemsListIntoTable(itemId, itemName) {
var table = $('#userTable').DataTable(); var table = $('#userTable').DataTable();
table.ajax.url('<%=usersCustomDataSourceURL%>'+itemId+'_selectedName='+itemName).load(); table.ajax.url('<%=usersCustomDataSourceURL%>'+itemId+'_selectedName='+encodeURIComponent(itemName)).load();
$('#userTable_info').hide(); $('#userTable_info').hide();
$('#userTable_length').hide(); $('#userTable_length').hide();
} }