From 12fd44d136a6bcfc40e32182fb1b1f1601b0cbca Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 5 Jun 2019 16:32:01 +0000 Subject: [PATCH] ref 16781:Sharing widget: the set of users loaded should be gateway dependant https://support.d4science.org/issues/16781 Added users retrieve operation by Gateway git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-sharing-widget@179676 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/GWTWorkspaceSharingBuilder.java | 6 +++--- .../server/WorkspaceSharingServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/GWTWorkspaceSharingBuilder.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/GWTWorkspaceSharingBuilder.java index d357902..9fcc541 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/GWTWorkspaceSharingBuilder.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/GWTWorkspaceSharingBuilder.java @@ -255,9 +255,9 @@ public class GWTWorkspaceSharingBuilder { * Error */ public List buildGXTListContactsModelFromUserModel(PortalContextInfo info) throws Exception { - - List listUsers = UserUtil.getOrganizationUsers(info.getCurrentScope()); - + + List listUsers = new LiferayUserManager().listUsersByGroup(info.getCurrGroupId()); + if (listUsers == null) { logger.error("No users found in: " + info.getCurrentScope()); throw new Exception("An error occurred on recovering users from Portal, try again later"); diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java index 3fc02c5..894a290 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java @@ -154,14 +154,14 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements } PortalContextInfo info = WsUtil.getPortalContext(this.getThreadLocalRequest()); - + GWTWorkspaceSharingBuilder builder = new GWTWorkspaceSharingBuilder(); List listContactsModel = builder.buildGXTListContactsModelFromUserModel(info); - listContactsModel.addAll(builder.getGXTListContactsModelFromVOs(info)); + //listContactsModel.addAll(builder.getGXTListContactsModelFromVOs(info)); - logger.debug("Get all contacts returning a list having size: " + listContactsModel.size()); + logger.debug("Get all Gateway Users returning a list having size: " + listContactsModel.size()); return listContactsModel; } catch (Exception e) {