From 6508c02e9a0bb06d6c9c85658726ecb0be207442 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Mon, 11 Jun 2018 16:59:05 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/pickitem-widget@169024 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/dialog/PickItemsDialog.java | 2 +- .../pickitem/client/oracle/UserOracle.java | 8 ++++++- .../client/oracle/UserSuggestion.java | 3 +++ .../pickitem/server/PickItemServiceImpl.java | 24 ++++++++----------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/pickitem/client/dialog/PickItemsDialog.java b/src/main/java/org/gcube/portlets/widgets/pickitem/client/dialog/PickItemsDialog.java index 4fbc000..f972f5d 100644 --- a/src/main/java/org/gcube/portlets/widgets/pickitem/client/dialog/PickItemsDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/pickitem/client/dialog/PickItemsDialog.java @@ -97,7 +97,7 @@ public class PickItemsDialog extends PopupPanel { // if it is a team, set the avatar if(bean.isItemGroup()) - bean.setThumbnailURL(CssAndImages.INSTANCE.iconTeam().getSafeUri().toString()); + bean.setThumbnailURL(CssAndImages.INSTANCE.iconTeam().getSafeUri().asString()); } } diff --git a/src/main/java/org/gcube/portlets/widgets/pickitem/client/oracle/UserOracle.java b/src/main/java/org/gcube/portlets/widgets/pickitem/client/oracle/UserOracle.java index 85c4a14..c148895 100644 --- a/src/main/java/org/gcube/portlets/widgets/pickitem/client/oracle/UserOracle.java +++ b/src/main/java/org/gcube/portlets/widgets/pickitem/client/oracle/UserOracle.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import org.gcube.portlets.widgets.pickitem.client.bundle.CssAndImages; import org.gcube.portlets.widgets.pickitem.client.rpc.PickItemService; import org.gcube.portlets.widgets.pickitem.client.rpc.PickItemServiceAsync; import org.gcube.portlets.widgets.pickitem.shared.ItemBean; @@ -22,7 +23,12 @@ public class UserOracle extends MultiWordSuggestOracle{ } public void addContacts(List users) { - contacts.addAll(users); + for (ItemBean bean : users) { + // if it is a team, set the avatar + if(bean.isItemGroup()) + bean.setThumbnailURL(CssAndImages.INSTANCE.iconTeam().getSafeUri().asString()); + contacts.add(bean); + } } @Override diff --git a/src/main/java/org/gcube/portlets/widgets/pickitem/client/oracle/UserSuggestion.java b/src/main/java/org/gcube/portlets/widgets/pickitem/client/oracle/UserSuggestion.java index 119f119..473828c 100644 --- a/src/main/java/org/gcube/portlets/widgets/pickitem/client/oracle/UserSuggestion.java +++ b/src/main/java/org/gcube/portlets/widgets/pickitem/client/oracle/UserSuggestion.java @@ -1,5 +1,6 @@ package org.gcube.portlets.widgets.pickitem.client.oracle; +import org.gcube.portlets.widgets.pickitem.client.bundle.CssAndImages; import org.gcube.portlets.widgets.pickitem.shared.ItemBean; import com.google.gwt.user.client.ui.SuggestOracle; @@ -10,6 +11,8 @@ public class UserSuggestion implements SuggestOracle.Suggestion { public UserSuggestion(ItemBean user) { this.user = user; + if (user.isItemGroup()) + user.setThumbnailURL(CssAndImages.INSTANCE.iconTeam().getSafeUri().asString()); } @Override diff --git a/src/main/java/org/gcube/portlets/widgets/pickitem/server/PickItemServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/pickitem/server/PickItemServiceImpl.java index 8dfb93f..8048ee2 100644 --- a/src/main/java/org/gcube/portlets/widgets/pickitem/server/PickItemServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/pickitem/server/PickItemServiceImpl.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import org.gcube.portlets.widgets.pickitem.client.bundle.CssAndImages; import org.gcube.portlets.widgets.pickitem.client.rpc.PickItemService; import org.gcube.portlets.widgets.pickitem.shared.ItemBean; import org.gcube.vomanagement.usermanagement.exception.GroupRetrievalFault; @@ -78,7 +79,9 @@ public class PickItemServiceImpl extends RemoteServiceServlet implements PickIte OrderByComparator teamComparator = OrderByComparatorFactoryUtil.create("team", "name", true); List teams = TeamLocalServiceUtil.search(currentGroupId, keyword, "", null, QueryUtil.ALL_POS, QueryUtil.ALL_POS, teamComparator); for (Team team : teams) { - toReturn.add(new ItemBean(team.getTeamId()+"", team.getName())); + ItemBean iBean = new ItemBean(team.getTeamId()+"", team.getName()); + iBean.setItemGroup(true); + toReturn.add(iBean); } } catch (Exception e) { e.printStackTrace(); @@ -88,8 +91,11 @@ public class PickItemServiceImpl extends RemoteServiceServlet implements PickIte toReturn.add(new ItemBean("id", "andrea.rossi", "Andrea Rossi", "email")); if (i % 2 == 0) toReturn.add(new ItemBean(""+i, "username"+i, "userGetFullname()"+i, "user.getEmail()"+i)); - else - toReturn.add(new ItemBean(""+i, "ciccio"+i, "ciccioNome"+i, "ciccioEMail"+i)); + else { + ItemBean groupBean = new ItemBean("idG"+i, "Group "+i); + groupBean.setItemGroup(true); + toReturn.add(new ItemBean(""+i, "Group "+i)); + } } } return toReturn; @@ -112,15 +118,5 @@ public class PickItemServiceImpl extends RemoteServiceServlet implements PickIte } return thumbnailURL; } - /** - * utility method extract the @domain.com from an email address - * return @unknown-domain in case of no emails - */ - private String extractDomainFromEmail(String email) { - int index = email.indexOf('@'); - if (index > 0) - return email.substring(index); - else - return "@unknown-domain"; - } + }