diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiDragContact.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiDragContact.java index b0d123b..ba2b63b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiDragContact.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiDragContact.java @@ -124,22 +124,22 @@ public class MultiDragContact extends Dialog { storeTarget.sort(InfoContactModel.FULLNAME, SortDir.ASC); - StoreFilterField filter = new StoreFilterField() { - - @Override - protected boolean doSelect(Store store, InfoContactModel parent, - InfoContactModel record, String property, String filter) { - - - String name = record.getName(); - name = name.toLowerCase(); - if (name.contains(filter.toLowerCase())) { - return true; - } - return false; - } - - }; + StoreFilterField filter = new StoreFilterField() { + + @Override + protected boolean doSelect(Store store, + InfoContactModel parent, InfoContactModel record, + String property, String filter) { + + String name = record.getName(); + name = name.toLowerCase(); + if (name.contains(filter.toLowerCase())) { + return true; + } + return false; + } + + }; // filter.setFieldLabel("Filter Contacts"); filter.setWidth(247); @@ -169,22 +169,22 @@ public class MultiDragContact extends Dialog { vp.add(new Label("Share with...")); gridShareWith = new Grid(storeTarget, createColumnModel()); - StoreFilterField filter2 = new StoreFilterField() { - - @Override - protected boolean doSelect(Store store, InfoContactModel parent, - InfoContactModel record, String property, String filter) { - - - String name = record.getName(); - name = name.toLowerCase(); - if (name.contains(filter.toLowerCase())) { - return true; - } - return false; - } - - }; + StoreFilterField filter2 = new StoreFilterField() { + + @Override + protected boolean doSelect(Store store, + InfoContactModel parent, InfoContactModel record, + String property, String filter) { + + String name = record.getName(); + name = name.toLowerCase(); + if (name.contains(filter.toLowerCase())) { + return true; + } + return false; + } + + }; // filter.setFieldLabel("Filter Contacts"); filter2.setWidth(247); @@ -260,11 +260,13 @@ public class MultiDragContact extends Dialog { gridAllContacts.mask("", ConstantsExplorer.LOADINGSTYLE); if(listContact!=null && listContact.size()>0){ - for (InfoContactModel infoContactModel : listContact) { - - if(infoContactModel.getName()!=null && !infoContactModel.getName().isEmpty()) - storeSource.add(infoContactModel); - } +// for (InfoContactModel infoContactModel : listContact) { +// +// if(infoContactModel.getName()!=null && !infoContactModel.getName().isEmpty()) +// storeSource.add(infoContactModel); +// } + + storeSource.add(listContact); } gridAllContacts.unmask(); } 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 881a0dc..5b2a765 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 @@ -1493,7 +1493,12 @@ public class GWTWorkspaceBuilder { List listContactsModel = new ArrayList(); for(User user: listUsers){ - listContactsModel.add(new InfoContactModel(user.getId(), user.getPortalLogin(), UserUtil.getUserFullName(user.getPortalLogin()))); + String fullName = UserUtil.getUserFullName(user.getPortalLogin()); + + if(fullName!=null && !fullName.isEmpty()) + listContactsModel.add(new InfoContactModel(user.getId(), user.getPortalLogin(), fullName)); + else + logger.trace("buildGXTListContactsModel doesn't return user: "+user.getPortalLogin()+ "because name is null or empty"); } return listContactsModel;