From f90fa79e663c939bff1d83f30f73a9f462226149 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 17 May 2019 10:15:36 +0000 Subject: [PATCH] Fixed access type to comply with StorageHub git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-sharing-widget@179466 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/GWTWorkspaceSharingBuilder.java | 6 +++--- .../server/WorkspaceSharingServiceImpl.java | 2 +- .../widgets/workspacesharingwidget/shared/ACL_TYPE.java | 2 +- 3 files changed, 5 insertions(+), 5 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 359f5be..cfab3c7 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 @@ -531,7 +531,7 @@ public class GWTWorkspaceSharingBuilder { break; case WRITE_ALL: - acls.add(new WorkspaceACL(acl.toString(), ACL_TYPE.WRITE_ANY, "Write Any", false, USER_TYPE.OTHER, + acls.add(new WorkspaceACL(acl.toString(), ACL_TYPE.WRITE_ALL, "Write Any", false, USER_TYPE.OTHER, "Any user can update/delete any file")); break; @@ -582,7 +582,7 @@ public class GWTWorkspaceSharingBuilder { break; case WRITE_ALL: - acls.add(new WorkspaceACL(acl.toString(), ACL_TYPE.WRITE_ANY, "Write Any", false, USER_TYPE.OTHER, + acls.add(new WorkspaceACL(acl.toString(), ACL_TYPE.WRITE_ALL, "Write Any", false, USER_TYPE.OTHER, "Any user can update/delete any file")); break; default: @@ -631,7 +631,7 @@ public class GWTWorkspaceSharingBuilder { break; case WRITE_ALL: - acls.add(new WorkspaceACL(acl.toString(), ACL_TYPE.WRITE_ANY, "Write Any", false, USER_TYPE.OTHER, + acls.add(new WorkspaceACL(acl.toString(), ACL_TYPE.WRITE_ALL, "Write All", false, USER_TYPE.OTHER, "Any user can update/delete any file")); break; default: 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 e847360..9f3f323 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 @@ -566,7 +566,7 @@ public class WorkspaceSharingServiceImpl extends RemoteServiceServlet implements switch (acl.getAclType()) { case READ_ONLY: return AccessType.READ_ONLY; - case WRITE_ANY: + case WRITE_ALL: return AccessType.WRITE_ALL; case WRITE_OWNER: return AccessType.WRITE_OWNER; diff --git a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/shared/ACL_TYPE.java b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/shared/ACL_TYPE.java index 0dfeab9..f0c7c57 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/shared/ACL_TYPE.java +++ b/src/main/java/org/gcube/portlets/widgets/workspacesharingwidget/shared/ACL_TYPE.java @@ -13,6 +13,6 @@ public enum ACL_TYPE { ADMINISTRATOR, // "Users are administrators" READ_ONLY, // "Users can read any file but cannot update/delete" WRITE_OWNER, //"Users can update/delete only their files" - WRITE_ANY; //"Any user can update/delete any file" + WRITE_ALL; //"Any user can update/delete any file" }