ref 17080: Workspace - list of users I shared folder with varies from a gateway to another
https://support.d4science.org/issues/17080 Fixed the retrieve operation of users information git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-sharing-widget@181091 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
ed4e91379a
commit
43dd4023f5
|
@ -226,14 +226,11 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
if (map != null && !map.isEmpty()) {
|
||||
List<InfoContactModel> listShared = new ArrayList<>();
|
||||
List<String> keys = new ArrayList<String>(map.keySet());
|
||||
List<InfoContactModel> listContactsModel = getAllContacts();
|
||||
for (String username : keys) {
|
||||
for (InfoContactModel contact : listContactsModel) {
|
||||
if (contact != null && contact.getLogin() != null
|
||||
&& contact.getLogin().compareTo(username) == 0) {
|
||||
if (username != null && !username.isEmpty()) {
|
||||
InfoContactModel contact = new InfoContactModel(username, username,
|
||||
UserUtil.getUserFullName(username), false);
|
||||
listShared.add(contact);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return listShared;
|
||||
|
@ -713,7 +710,8 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
}
|
||||
} else {
|
||||
logger.error("The item requested is not a valid shared folder : [itemId=" + itemId + "]");
|
||||
throw new Exception("The item requested is not a valid shared folder. Impossible set the administrators.");
|
||||
throw new Exception(
|
||||
"The item requested is not a valid shared folder. Impossible set the administrators.");
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
|
@ -1164,7 +1162,6 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
private List<WorkspaceACL> retrieveUserACLsFromFolderContainer(FolderContainer folderContainer) throws Exception {
|
||||
String currentUser = getMyLogin();
|
||||
logger.debug("Current User: " + currentUser);
|
||||
|
|
Loading…
Reference in New Issue