From 948c11bbd2186efd2bafff47ca15da6fa6507201 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 7 Oct 2014 15:06:12 +0100
Subject: [PATCH] Added max_filesize to all image uploader views

---
 wagtail/wagtailimages/views/chooser.py  | 3 ++-
 wagtail/wagtailimages/views/images.py   | 2 ++
 wagtail/wagtailimages/views/multiple.py | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailimages/views/chooser.py b/wagtail/wagtailimages/views/chooser.py
index 0312b3a2e..68871db8a 100644
--- a/wagtail/wagtailimages/views/chooser.py
+++ b/wagtail/wagtailimages/views/chooser.py
@@ -11,6 +11,7 @@ from wagtail.wagtailsearch.backends import get_search_backends
 from wagtail.wagtailimages.models import get_image_model
 from wagtail.wagtailimages.forms import get_image_form, ImageInsertionForm
 from wagtail.wagtailimages.formats import get_image_format
+from wagtail.wagtailimages.utils.validators import get_max_image_filesize
 
 
 def get_image_json(image):
@@ -146,7 +147,7 @@ def chooser_upload(request):
 
     return render_modal_workflow(
         request, 'wagtailimages/chooser/chooser.html', 'wagtailimages/chooser/chooser.js',
-        {'images': images, 'uploadform': form, 'searchform': searchform}
+        {'images': images, 'uploadform': form, 'searchform': searchform, 'max_filesize': get_max_image_filesize()}
     )
 
 
diff --git a/wagtail/wagtailimages/views/images.py b/wagtail/wagtailimages/views/images.py
index d3713f1cf..9c191d0d1 100644
--- a/wagtail/wagtailimages/views/images.py
+++ b/wagtail/wagtailimages/views/images.py
@@ -17,6 +17,7 @@ from wagtail.wagtailsearch.backends import get_search_backends
 from wagtail.wagtailimages.models import get_image_model, Filter
 from wagtail.wagtailimages.forms import get_image_form, URLGeneratorForm
 from wagtail.wagtailimages.utils.crypto import generate_signature
+from wagtail.wagtailimages.utils.validators import get_max_image_filesize
 
 
 @permission_required('wagtailimages.add_image')
@@ -223,6 +224,7 @@ def add(request):
 
     return render(request, "wagtailimages/images/add.html", {
         'form': form,
+        'max_filesize': get_max_image_filesize(),
     })
 
 
diff --git a/wagtail/wagtailimages/views/multiple.py b/wagtail/wagtailimages/views/multiple.py
index 90d468769..9cb8e8c64 100644
--- a/wagtail/wagtailimages/views/multiple.py
+++ b/wagtail/wagtailimages/views/multiple.py
@@ -14,7 +14,7 @@ from wagtail.wagtailsearch.backends import get_search_backends
 
 from wagtail.wagtailimages.models import get_image_model
 from wagtail.wagtailimages.forms import get_image_form_for_multi
-from wagtail.wagtailimages.utils.validators import validate_image_format, validate_image_filesize
+from wagtail.wagtailimages.utils.validators import validate_image_format, validate_image_filesize, get_max_image_filesize
 
 
 def json_response(document):
@@ -61,7 +61,9 @@ def add(request):
         })
 
 
-    return render(request, 'wagtailimages/multiple/add.html', {})
+    return render(request, 'wagtailimages/multiple/add.html', {
+        'max_filesize': get_max_image_filesize(),
+    })
 
 
 @require_POST