From d7caa089bf2f5242bcf26e3b03097c6c65ebacf5 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 6 Oct 2015 08:55:36 +0000 Subject: [PATCH] 429: Workspace: uploading big files Task-Url: https://support.d4science.org/issues/429 Added check to avoid multiple upload archive git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@119424 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/uploader/DialogUpload.java | 12 +++++------- .../client/uploader/MultipleDilaogUpload.java | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java index 487377e..bdac3f1 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java +++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java @@ -78,7 +78,11 @@ public class DialogUpload extends ClosableDialog implements HasWorskpaceUploadNo */ public DialogUpload(String headerTitle, final String parentId, UPLOAD_TYPE uploadType){ super(false, true, headerTitle); -// setText(headerTitle); + + //ONLY IN CASE OF FILE MULTIPLE UPLOAD IS AVAILABLE + if(uploadType.equals(UPLOAD_TYPE.File)) + fileUpload.getElement().setAttribute("multiple", "multiple"); + this.parentIdentifier = parentId; this.addStyleName("fileInputUploader"); formPanel.setAction(ConstantsWorkspaceUploader.WORKSPACE_UPLOADER_SERVLET_STREAM); @@ -99,17 +103,13 @@ public class DialogUpload extends ClosableDialog implements HasWorskpaceUploadNo panel.add(new Hidden(ConstantsWorkspaceUploader.UPLOAD_TYPE,uploadType.toString())); panel.add(hiddenOverwrite); -// clientUploadKey = GenerateUUID.get(15, 16); initJsonClientKeys(); panel.add(jsonClientKeys); panel.add(fileUpload); hpButtons = new HorizontalPanel(); hpButtons.getElement().getStyle().setMarginTop(10, Unit.PX); -// hpButtons.getElement().getStyle().setMarginBottom(10, Unit.PX); -// btnCancel.getElement().getStyle().setMarginLeft(10, Unit.PX); hpButtons.add(btnUpload); -// hpButtons.add(btnCancel); panel.add(hpButtons); HorizontalPanel hp = new HorizontalPanel(); @@ -117,8 +117,6 @@ public class DialogUpload extends ClosableDialog implements HasWorskpaceUploadNo hp.getElement().getStyle().setWidth(100, Unit.PCT); hp.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); hp.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_RIGHT); - -// vp.add(anchorMyUploads); anchorMyUploads = new Anchor(ConstantsWorkspaceUploader.MY_UPLOADS); anchorMyUploads.addClickHandler(new ClickHandler() { diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUpload.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUpload.java index a7978b7..1a89b54 100644 --- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUpload.java +++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUpload.java @@ -50,7 +50,6 @@ public class MultipleDilaogUpload extends DialogUpload { */ public MultipleDilaogUpload(String headerTitle, String parentId, UPLOAD_TYPE uploadType) { super(headerTitle, parentId, uploadType); - fileUpload.getElement().setAttribute("multiple", "multiple"); fileUploadID = GenerateUUID.get(10, 16); //is tagID fileUpload.getElement().setId(fileUploadID); this.addHandlers();