gCubeSystem
/
workspace-tree-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replaced the user ALL with empty string in case of unshare, removed 

-SNAPSHOT to be released
This commit is contained in:
Francesco Mangiacrapa 2020-06-25 17:11:38 +02:00
parent 8cd11d782c
commit 2ff3ba214b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace-tree-widget</artifactId> <artifactId>workspace-tree-widget</artifactId>
<version>6.30.1-SNAPSHOT</version> <version>6.30.1</version>
<name>gCube Workspace Tree Widget</name> <name>gCube Workspace Tree Widget</name>
<description> <description>
gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace
@ -128,7 +128,7 @@
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-scope-maps</artifactId> <artifactId>common-scope-maps</artifactId>
<scope>compile</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- END FWS --> <!-- END FWS -->

4
src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
View File

@ -484,7 +484,7 @@ public class StorageHubToWorkpaceConverter implements Serializable{
user = buildGxtInfoContactFromPortalLogin(shubAccEntry.getUser()); user = buildGxtInfoContactFromPortalLogin(shubAccEntry.getUser());
}else { }else {
//CASE ALL //CASE ALL
user = new InfoContactModel(theUser, theUser, theUser, null, false); user = new InfoContactModel(theUser, "", "", null, false);
} }
af.setUser(user); af.setUser(user);
af.setDate(FormatterUtil.toDate(shubAccEntry.getDate())); af.setDate(FormatterUtil.toDate(shubAccEntry.getDate()));
@ -687,7 +687,7 @@ public class StorageHubToWorkpaceConverter implements Serializable{
AccountEntryUnshare uns = (AccountEntryUnshare) shubAccEntry; AccountEntryUnshare uns = (AccountEntryUnshare) shubAccEntry;
String msg = "Folder "; String msg = "Folder ";
msg+= uns.getItemName()==null || uns.getItemName().isEmpty()?"":uns.getItemName()+" "; msg+= uns.getItemName()==null || uns.getItemName().isEmpty()?"":uns.getItemName()+" ";
if(user.getName().equalsIgnoreCase("ALL")) { if(shubAccEntry.getUser().equalsIgnoreCase("ALL")) {
msg+= "is no longer shared"; msg+= "is no longer shared";
}else }else
msg+= "is no longer shared with "+user.getName(); msg+= "is no longer shared with "+user.getName();