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

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
This commit is contained in:
Francesco Mangiacrapa 2015-11-17 17:34:35 +00:00
parent 0ded2ac486
commit b07d468ff1
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java
View File

@ -712,16 +712,11 @@ public class GWTWorkspaceBuilder {
break; break;
} }
//ACCOUNTING
//REMOVED IS MARK AS READ FROM HL
// fileModel.setMarkAsRead(item.isMarkedAsRead());
if(parentFolderModel!=null && parentFolderModel.isShared()){ if(parentFolderModel!=null && parentFolderModel.isShared()){
fileModel.setShared(true); fileModel.setShared(true);
fileModel.setShareable(false); //UPDATED TO CHANGE PERMISSIONS TO SHARED SUBFOLDERS 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; return fileModel;
} }
@ -788,15 +783,12 @@ public class GWTWorkspaceBuilder {
fileGridModel.setShareable(false); //UPDATED TO CHANGE PERMISSIONS TO SHARED SUBFOLDERS fileGridModel.setShareable(false); //UPDATED TO CHANGE PERMISSIONS TO SHARED SUBFOLDERS
} }
//TODO ISSHARED IN SEARCH ITEM IN HL TO RETRIEVE SHARE ON WORKSPACEITEM
//OWNER //OWNER
if(item.isShared()){ //IS READ FROM HL ONLY IF THE ITEM IS SHARED if(item.isShared()){ //IS READ FROM HL ONLY IF THE ITEM IS SHARED
fileGridModel.setShared(true); //TEMPORARY SOLUTION: ADDED TO FIX WRONG TYPE SearchFolderItem 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){ if(portalLogin!=null){
String fullName = portalLogin; fileGridModel.setOwnerFullName(UserUtil.getUserFullName(portalLogin));
fullName = UserUtil.getUserFullName(portalLogin);
fileGridModel.setOwnerFullName(fullName);
} }
} }
else{ else{
@ -891,9 +883,7 @@ public class GWTWorkspaceBuilder {
if(owner!=null){ if(owner!=null){
// System.out.println("++++reading owner"); // System.out.println("++++reading owner");
String portalLogin = owner.getPortalLogin(); String portalLogin = owner.getPortalLogin();
String fullName = portalLogin; fileGridModel.setOwnerFullName(UserUtil.getUserFullName(portalLogin));
fullName = UserUtil.getUserFullName(portalLogin);
fileGridModel.setOwnerFullName(fullName);
} }
} }
else{ else{

4
src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java
View File

@ -69,8 +69,8 @@ public class UserUtil {
} }
}else{ }else{
logger.trace("DEVELOPEMENT MODE ON"); logger.trace("DEVELOPEMENT MODE ON");
logger.trace("Returning "+WsUtil.TEST_USER_FULL_NAME +" full name for: "+portalLogin); logger.trace("Returning input login: "+portalLogin);
return WsUtil.TEST_USER_FULL_NAME; return portalLogin;
} }
logger.trace("Return portal login as full name for: "+portalLogin); logger.trace("Return portal login as full name for: "+portalLogin);