From 2ff3ba214be365258a257455c80e69bb8dba78b6 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 25 Jun 2020 17:11:38 +0200
Subject: [PATCH] replaced the user ALL with empty string in case of unshare,
 removed -SNAPSHOT to be released

---
 pom.xml                                                       | 4 ++--
 .../server/tostoragehub/StorageHubToWorkpaceConverter.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6c358a8..9851010 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace-tree-widget</artifactId>
-	<version>6.30.1-SNAPSHOT</version>
+	<version>6.30.1</version>
 	<name>gCube Workspace Tree Widget</name>
 	<description>
 		gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace 
@@ -128,7 +128,7 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
-			<scope>compile</scope>
+			<scope>provided</scope>
 		</dependency>
 		<!-- END FWS -->
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
index e981508..7a20119 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
@@ -484,7 +484,7 @@ public class StorageHubToWorkpaceConverter implements Serializable{
 					user = buildGxtInfoContactFromPortalLogin(shubAccEntry.getUser());
 				}else {
 					//CASE ALL
-					user = new InfoContactModel(theUser, theUser, theUser, null, false);
+					user = new InfoContactModel(theUser, "", "", null, false);
 				}
 				af.setUser(user);
 				af.setDate(FormatterUtil.toDate(shubAccEntry.getDate()));
@@ -687,7 +687,7 @@ public class StorageHubToWorkpaceConverter implements Serializable{
 						AccountEntryUnshare uns = (AccountEntryUnshare) shubAccEntry;
 						String msg = "Folder ";
 						msg+= uns.getItemName()==null || uns.getItemName().isEmpty()?"":uns.getItemName()+" ";
-						if(user.getName().equalsIgnoreCase("ALL")) {
+						if(shubAccEntry.getUser().equalsIgnoreCase("ALL")) {
 							msg+= "is no longer shared";
 						}else
 							msg+= "is no longer shared with "+user.getName();