Marijan Milicevic pushed to branch bugfix/CMS-10555 at cms-community / hippo-cms
Commits: e8db6822 by Marijan Milicevic at 2017-03-28T15:48:44+02:00 CMS-10555 When uploading multiple images exceeds the page lock timeout not all images are uploaded - make sure images are sent in sequence - release page lock after image is uploaded - - - - - 2 changed files: - api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/behaviors/AjaxFileUploadBehavior.java - api/src/main/resources/org/hippoecm/frontend/plugins/jquery/upload/multiple/fileupload-gallery-config.js Changes: ===================================== api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/behaviors/AjaxFileUploadBehavior.java ===================================== --- a/api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/behaviors/AjaxFileUploadBehavior.java +++ b/api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/behaviors/AjaxFileUploadBehavior.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2015-2017 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,12 +22,15 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; import org.apache.wicket.Application; +import org.apache.wicket.Page; +import org.apache.wicket.Session; import org.apache.wicket.ajax.json.JSONArray; import org.apache.wicket.ajax.json.JSONException; import org.apache.wicket.ajax.json.JSONObject; import org.apache.wicket.behavior.AbstractAjaxBehavior; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.upload.FileUpload; +import org.apache.wicket.page.IPageManager; import org.apache.wicket.protocol.http.servlet.MultipartServletWebRequest; import org.apache.wicket.protocol.http.servlet.ServletWebRequest; import org.apache.wicket.request.cycle.RequestCycle; @@ -180,6 +183,12 @@ public abstract class AjaxFileUploadBehavior extends AbstractAjaxBehavior { } TextRequestHandler textRequestHandler = new TextRequestHandler(contentType, encoding, responseContent); RequestCycle.get().scheduleRequestHandlerAfterCurrent(textRequestHandler); + // touch page and commit request so page gets released (detached) + final Session session = Session.get(); + final IPageManager pageManager = session.getPageManager(); + final Page page = container.getPage(); + pageManager.touchPage(page); + pageManager.commitRequest(); } private String generateJsonResponse(final Map<String, FileUploadInfo> uploadedFiles) { ===================================== api/src/main/resources/org/hippoecm/frontend/plugins/jquery/upload/multiple/fileupload-gallery-config.js ===================================== --- a/api/src/main/resources/org/hippoecm/frontend/plugins/jquery/upload/multiple/fileupload-gallery-config.js +++ b/api/src/main/resources/org/hippoecm/frontend/plugins/jquery/upload/multiple/fileupload-gallery-config.js @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2014-2017 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,9 @@ acceptFileTypes: /(\.)${acceptFileTypes}$/i, dataType: 'json', previewMaxWidth: 32, - previewMaxHeight: 32 + previewMaxHeight: 32, + limitMultiFileUploads:1, + sequentialUploads:true }); })(); View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/e8db6822cdb66031de03641d788bf05a8dcc628d
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
