|
|
|
@ -79,7 +79,7 @@ public class ObjectStorageHubToWorkpaceMapper {
|
|
|
|
|
* @return the file model
|
|
|
|
|
* @throws InternalErrorException the internal error exception
|
|
|
|
|
*/
|
|
|
|
|
public static FileModel toTreeFileModelItem(org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceItem wrappedItem, FileModel parentFolderModel, boolean isParentShared) throws InternalErrorException{
|
|
|
|
|
public static FileModel toTreeFileModelItem(org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceItem wrappedItem, FileModel parentFolderModel, boolean isParentShared, GCubeUser loggedUser) throws InternalErrorException{
|
|
|
|
|
|
|
|
|
|
FileModel fileModel = null;
|
|
|
|
|
//boolean isPublic = false;
|
|
|
|
@ -145,6 +145,8 @@ public class ObjectStorageHubToWorkpaceMapper {
|
|
|
|
|
fileModel.setShareable(false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
setFullNameOwner(wrappedItem, fileModel, loggedUser);
|
|
|
|
|
|
|
|
|
|
//setSynchedThreddsStateFor(fileModel);
|
|
|
|
|
fileModel.setIsRoot(wrappedItem.isRoot());
|
|
|
|
|
logger.trace("Returning converted tree item: "+fileModel);
|
|
|
|
@ -247,27 +249,32 @@ public class ObjectStorageHubToWorkpaceMapper {
|
|
|
|
|
fileGridModel.setShareable(false); //UPDATED TO CHANGE PERMISSIONS TO SHARED SUBFOLDERS
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
setFullNameOwner(wrappedItem, fileGridModel, loggedUser);
|
|
|
|
|
|
|
|
|
|
logger.trace("Returning converted grid item: "+fileGridModel);
|
|
|
|
|
return fileGridModel;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static void setFullNameOwner(org.gcube.common.storagehubwrapper.shared.tohl.WorkspaceItem wrappedItem, FileModel fileModel, GCubeUser loggedUser) {
|
|
|
|
|
//OWNER
|
|
|
|
|
if(wrappedItem.isShared()){ //IT IS READ FROM SHUB ONLY IF THE ITEM IS SHARED
|
|
|
|
|
fileGridModel.setShared(true); //NOT REMOVE IT IS IMPORTANT, SEE #1459
|
|
|
|
|
fileModel.setShared(true); //NOT REMOVE IT IS IMPORTANT, SEE #1459
|
|
|
|
|
String ownerUsername = wrappedItem.getOwner();
|
|
|
|
|
if(ownerUsername!=null){
|
|
|
|
|
// System.out.println("++++reading owner");
|
|
|
|
|
//String portalLogin = owner.getPortalLogin();
|
|
|
|
|
fileGridModel.setOwnerFullName(UserUtil.getUserFullName(ownerUsername));
|
|
|
|
|
fileModel.setOwnerFullName(UserUtil.getUserFullName(ownerUsername));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
String ownerUsername = wrappedItem.getOwner();
|
|
|
|
|
//Task #12911 I'm calling getUserFullName for any user other than logged user
|
|
|
|
|
if(ownerUsername!=null && ownerUsername.compareToIgnoreCase(loggedUser.getUsername())!=0){
|
|
|
|
|
fileGridModel.setOwnerFullName(UserUtil.getUserFullName(ownerUsername));
|
|
|
|
|
fileModel.setOwnerFullName(UserUtil.getUserFullName(ownerUsername));
|
|
|
|
|
}else
|
|
|
|
|
fileGridModel.setOwnerFullName(loggedUser.getFullname());
|
|
|
|
|
fileModel.setOwnerFullName(loggedUser.getFullname());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
logger.trace("Returning converted grid item: "+fileGridModel);
|
|
|
|
|
return fileGridModel;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|