From 462f4927de26b7636b3f714b59f3fa52b84ba841 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 29 May 2014 10:44:34 +0000 Subject: [PATCH] fixed https://issue.imarine.research-infrastructures.eu/ticket/2797 added display name property https://issue.imarine.research-infrastructures.eu/ticket/2839 git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@96247 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/view/sharing/UserStore.java | 2 +- .../workspace/server/GWTWorkspaceBuilder.java | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/UserStore.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/UserStore.java index 949d3a6..b507c94 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/UserStore.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/UserStore.java @@ -85,10 +85,10 @@ public class UserStore implements ContactFetcher{ List listExclusiveContact = new ArrayList(listAllContact); for (InfoContactModel contact : listSharedUser) { if(listAllContact.contains(contact)){ +// GWT.log("Removing not eclusive contact "+contact); listExclusiveContact.remove(contact); } } - return listExclusiveContact; } 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 90c53e6..bf22ebf 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 @@ -148,8 +148,8 @@ public class GWTWorkspaceBuilder { hashTestUser.put("massimiliano.assante", new InfoContactModel("massimiliano.assante", "massimiliano.assante", "Massimiliano Assante",false)); //GROUPS - hashTestUser.put("/gcube/devsec/devVRE", new InfoContactModel("/gcube/devsec/devVRE", "/gcube/devsec/devVRE", "",true)); - hashTestUser.put("/gcube/devsec/gcube-test-test", new InfoContactModel("/gcube/devsec/gcube-test-test", "/gcube/gcube-test-test", "",true)); +// hashTestUser.put("/gcube/devsec/devVRE", new InfoContactModel("/gcube/devsec/devVRE", "/gcube/devsec/devVRE", "",true)); +// hashTestUser.put("/gcube/devsec/gcube-test-test", new InfoContactModel("/gcube/devsec/gcube-test-test", "/gcube/gcube-test-test", "",true)); } return hashTestUser; @@ -1717,11 +1717,21 @@ public class GWTWorkspaceBuilder { if(groupDN==null || groupDN.isEmpty()) groupDN = group.getName(); - listContactsModel.add(new InfoContactModel(group.getName(), group.getName(), groupDN, true)); + if(group.getName()== null || group.getName().isEmpty()) + logger.warn("Skipping group with null or empty name "+group); + else{ + InfoContactModel contact = new InfoContactModel(group.getName(), group.getName(), groupDN, true); + logger.trace("Adding group "+contact); + listContactsModel.add(contact); + } }catch (InternalErrorException e) { logger.warn("Dispaly name is not available to group "+group); logger.warn("Adding get name property "+group.getName()); - listContactsModel.add(new InfoContactModel(group.getName(), group.getName(), group.getName(), true)); + + if(group.getName()== null || group.getName().isEmpty()) + logger.warn("Skipping group with null or empty name "+group); + else + listContactsModel.add(new InfoContactModel(group.getName(), group.getName(), group.getName(), true)); } }