Merge pull request #34 from conikuvat/limitconcurrentuploads

Limit concurrent uploads

README.md

@@ -43,6 +43,8 @@ Usage
         multiupload_maxfilesize = 3 * 2 ** 20 # 3 Mb
         # min allowed filesize for uploads in bytes
         multiupload_minfilesize = 0
+        # limit concurrent uploads in order to avoid timeouts (try 6–10 if experiencing problems)
+        multiupload_limitconcurrentuploads = None
         # tuple with mimetype accepted
         multiupload_acceptedformats = ( "image/jpeg",
                                         "image/pjpeg",
@@ -92,8 +94,3 @@ Usage
 
 Checkout some full example project in example folder.
 Superuser: Login: demo Pass: demo
-
-
-
-
-

example/gallery/admin.py

@@ -39,7 +39,8 @@ def delete_file(self, pk, request):
 class ImageAdmin(GalleryMultiuploadMixing, MultiUploadAdmin):
     multiupload_form = False
     multiupload_list = True
+    multiupload_limitconcurrentuploads = 6
 
 
 admin.site.register(Gallery, GalleryAdmin)
-admin.site.register(Image, ImageAdmin)
+admin.site.register(Image, ImageAdmin)

multiupload/admin.py

@@ -46,6 +46,7 @@ class Media:
     multiupload_acceptedformats = ("image/jpeg",
                                    "image/pjpeg",
                                    "image/png", )
+    multiupload_limitconcurrentuploads = None
 
     multiupload_view_context = {}
 
@@ -262,6 +263,10 @@ def admin_upload_view(self, request, id=None):
                 # some of the parameters to be checked by javascript
                 "maxfilesize": self.upload_options["maxfilesize"],
                 "minfilesize": self.upload_options["minfilesize"],
+                "limitconcurrentuploads": (
+                    'undefined' if self.multiupload_limitconcurrentuploads is None
+                    else self.multiupload_limitconcurrentuploads
+                ),
                 # django admin parameters
                 "object": object,
                 'media': self.media,

multiupload/templates/multiupload/upload.html

@@ -175,7 +175,8 @@
 
     // Initialize the jQuery File Upload widget:
     $('#fileupload').fileupload({
-      formData: [{ name: "csrfmiddlewaretoken", value: "{{ csrf_token }}"}]
+      formData: [{ name: "csrfmiddlewaretoken", value: "{{ csrf_token }}"}],
+      limitConcurrentUploads: {{ limitconcurrentuploads }}
       }).bind('fileuploadsubmit', function (e, data) {
         var inputs = data.context.find(':input');
         if (inputs.filter('[required][value=""]').first().focus().length) {