From a02e4215eebfb5adaf927ea86bb1e398fcc12785 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 3 Dec 2018 11:55:15 +0000 Subject: [PATCH] updated pom version at 2.24.0 Task 12911 completed git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@174514 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../tostoragehub/ObjectStorageHubToWorkpaceMapper.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c468ae9..17cf58a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.portlets.user workspace-tree-widget - 6.23.0-SNAPSHOT + 6.24.0-SNAPSHOT gCube Workspace Tree Widget gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java index ff31156..411370a 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/ObjectStorageHubToWorkpaceMapper.java @@ -232,8 +232,11 @@ public class ObjectStorageHubToWorkpaceMapper { } } else{ - if(loggedUser!=null) - // fileGridModel.setOwner(new InfoContactModel(userLogged.getId(), userLogged.getLogin(), userLogged.getName())); + 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)); + }else fileGridModel.setOwnerFullName(loggedUser.getFullname()); }