From b07d468ff11f746e267821e57a43ab1c094c7926 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 17 Nov 2015 17:34:35 +0000 Subject: [PATCH] Completed #1332 and fix #1338 git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@120298 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../workspace/server/GWTWorkspaceBuilder.java | 18 ++++-------------- .../user/workspace/server/util/UserUtil.java | 4 ++-- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java index a9c2e44..d639eb9 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java @@ -712,16 +712,11 @@ public class GWTWorkspaceBuilder { break; } - //ACCOUNTING - //REMOVED IS MARK AS READ FROM HL -// fileModel.setMarkAsRead(item.isMarkedAsRead()); + if(parentFolderModel!=null && parentFolderModel.isShared()){ fileModel.setShared(true); fileModel.setShareable(false); //UPDATED TO CHANGE PERMISSIONS TO SHARED SUBFOLDERS -// fileModel.setShareable(true); } -// fileModel.setOwner(new InfoContactModel(item.getOwner().getId(), item.getOwner().getPortalLogin(), "name")); -//// fileModel.setShared(item.isShared()); return fileModel; } @@ -788,15 +783,12 @@ public class GWTWorkspaceBuilder { fileGridModel.setShareable(false); //UPDATED TO CHANGE PERMISSIONS TO SHARED SUBFOLDERS } - //TODO ISSHARED IN SEARCH ITEM IN HL TO RETRIEVE SHARE ON WORKSPACEITEM //OWNER if(item.isShared()){ //IS READ FROM HL ONLY IF THE ITEM IS SHARED fileGridModel.setShared(true); //TEMPORARY SOLUTION: ADDED TO FIX WRONG TYPE SearchFolderItem - String portalLogin = item.getOwner(); + String portalLogin = item.getOwner(); //IS PORTAL LOGIN if(portalLogin!=null){ - String fullName = portalLogin; - fullName = UserUtil.getUserFullName(portalLogin); - fileGridModel.setOwnerFullName(fullName); + fileGridModel.setOwnerFullName(UserUtil.getUserFullName(portalLogin)); } } else{ @@ -891,9 +883,7 @@ public class GWTWorkspaceBuilder { if(owner!=null){ // System.out.println("++++reading owner"); String portalLogin = owner.getPortalLogin(); - String fullName = portalLogin; - fullName = UserUtil.getUserFullName(portalLogin); - fileGridModel.setOwnerFullName(fullName); + fileGridModel.setOwnerFullName(UserUtil.getUserFullName(portalLogin)); } } else{ diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java index f6489ff..42efd0d 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java @@ -69,8 +69,8 @@ public class UserUtil { } }else{ logger.trace("DEVELOPEMENT MODE ON"); - logger.trace("Returning "+WsUtil.TEST_USER_FULL_NAME +" full name for: "+portalLogin); - return WsUtil.TEST_USER_FULL_NAME; + logger.trace("Returning input login: "+portalLogin); + return portalLogin; } logger.trace("Return portal login as full name for: "+portalLogin);