From b32c187dc606d7be86245cb6cd668d5ea2a317bf Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 7 Feb 2017 10:29:25 +0000 Subject: [PATCH] Improved message in case of InsufficenPrivileges git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@142310 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/upload/WorkspaceUploaderMng.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/upload/WorkspaceUploaderMng.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/upload/WorkspaceUploaderMng.java index 5190cc7..259acb3 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/upload/WorkspaceUploaderMng.java +++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/upload/WorkspaceUploaderMng.java @@ -101,8 +101,7 @@ public class WorkspaceUploaderMng { } catch (Exception e1) { logger.error("Error during WorkspaceUploaderItem session update: ",e1); } - } catch (InternalErrorException - | IOException e) { + } catch (InternalErrorException | IOException e) { logger.error("Error during upload: ",e); workspaceUploader.setStatusDescription("An error occurred server-side during upload: "+itemName+". "+e.getMessage() +". Try again"); workspaceUploader.setUploadStatus(UPLOAD_STATUS.FAILED); @@ -112,10 +111,16 @@ public class WorkspaceUploaderMng { logger.error("Error during WorkspaceUploaderItem session update: ",e1); } - } catch (InsufficientPrivilegesException| ItemAlreadyExistException | ItemNotFoundException | WrongItemTypeException | WorkspaceFolderNotFoundException | WrongDestinationException e) { - logger.error("Error during overwrite: ",e); - workspaceUploader.setStatusDescription("An error occurred during upload: "+itemName+". "+e.getMessage()); + } catch (InsufficientPrivilegesException | ItemAlreadyExistException | ItemNotFoundException | WrongItemTypeException | WorkspaceFolderNotFoundException | WrongDestinationException e) { + logger.error("Error during file uploading: ",e); workspaceUploader.setUploadStatus(UPLOAD_STATUS.FAILED); + + if (e instanceof InsufficientPrivilegesException){ + String folderName = destinationFolder.getName(); + workspaceUploader.setStatusDescription("You have not permission to upload in the folder: "+folderName); + }else{ + workspaceUploader.setStatusDescription("An error occurred during upload: "+itemName+". "+e.getMessage()); + } try { WsUtil.putWorkspaceUploaderInSession(httpSession, workspaceUploader); } catch (Exception e1) {