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

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
This commit is contained in:
Francesco Mangiacrapa 2014-05-29 10:44:34 +00:00
parent d5ccb5d3d7
commit 462f4927de
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/UserStore.java
View File

@ -85,10 +85,10 @@ public class UserStore implements ContactFetcher{
List<InfoContactModel> listExclusiveContact = new ArrayList<InfoContactModel>(listAllContact); List<InfoContactModel> listExclusiveContact = new ArrayList<InfoContactModel>(listAllContact);
for (InfoContactModel contact : listSharedUser) { for (InfoContactModel contact : listSharedUser) {
if(listAllContact.contains(contact)){ if(listAllContact.contains(contact)){
// GWT.log("Removing not eclusive contact "+contact);
listExclusiveContact.remove(contact); listExclusiveContact.remove(contact);
} }
} }
return listExclusiveContact; return listExclusiveContact;
} }

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

@ -148,8 +148,8 @@ public class GWTWorkspaceBuilder {
hashTestUser.put("massimiliano.assante", new InfoContactModel("massimiliano.assante", "massimiliano.assante", "Massimiliano Assante",false)); hashTestUser.put("massimiliano.assante", new InfoContactModel("massimiliano.assante", "massimiliano.assante", "Massimiliano Assante",false));
//GROUPS //GROUPS
hashTestUser.put("/gcube/devsec/devVRE", new InfoContactModel("/gcube/devsec/devVRE", "/gcube/devsec/devVRE", "",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)); // hashTestUser.put("/gcube/devsec/gcube-test-test", new InfoContactModel("/gcube/devsec/gcube-test-test", "/gcube/gcube-test-test", "",true));
} }
return hashTestUser; return hashTestUser;
@ -1717,11 +1717,21 @@ public class GWTWorkspaceBuilder {
if(groupDN==null || groupDN.isEmpty()) if(groupDN==null || groupDN.isEmpty())
groupDN = group.getName(); 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) { }catch (InternalErrorException e) {
logger.warn("Dispaly name is not available to group "+group); logger.warn("Dispaly name is not available to group "+group);
logger.warn("Adding get name property "+group.getName()); 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));
} }
} }