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

ref 17080: Workspace - list of users I shared folder with varies from a gateway to another 

https://support.d4science.org/issues/17080

Fix removed due to problems with shared folder by groups in the old HL

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-sharing-widget@181092 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2019-07-01 10:58:10 +00:00
parent 43dd4023f5
commit 651e35ec87
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/server/WorkspaceSharingServiceImpl.java
View File

@ -226,11 +226,14 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
if (map != null && !map.isEmpty()) { if (map != null && !map.isEmpty()) {
List<InfoContactModel> listShared = new ArrayList<>(); List<InfoContactModel> listShared = new ArrayList<>();
List<String> keys = new ArrayList<String>(map.keySet()); List<String> keys = new ArrayList<String>(map.keySet());
List<InfoContactModel> listContactsModel = getAllContacts();
for (String username : keys) { for (String username : keys) {
if (username != null && !username.isEmpty()) { for (InfoContactModel contact : listContactsModel) {
InfoContactModel contact = new InfoContactModel(username, username, if (contact != null && contact.getLogin() != null
UserUtil.getUserFullName(username), false); && contact.getLogin().compareTo(username) == 0) {
listShared.add(contact); listShared.add(contact);
break;
}
} }
} }
return listShared; return listShared;
@ -710,8 +713,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
} }
} else { } else {
logger.error("The item requested is not a valid shared folder : [itemId=" + itemId + "]"); logger.error("The item requested is not a valid shared folder : [itemId=" + itemId + "]");
throw new Exception( throw new Exception("The item requested is not a valid shared folder. Impossible set the administrators.");
"The item requested is not a valid shared folder. Impossible set the administrators.");
} }
} catch (Exception e) { } catch (Exception e) {
@ -1162,6 +1164,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements
} }
} }
private List<WorkspaceACL> retrieveUserACLsFromFolderContainer(FolderContainer folderContainer) throws Exception { private List<WorkspaceACL> retrieveUserACLsFromFolderContainer(FolderContainer folderContainer) throws Exception {
String currentUser = getMyLogin(); String currentUser = getMyLogin();
logger.debug("Current User: " + currentUser); logger.debug("Current User: " + currentUser);