From 7f21efd55d35a1d30f95746bc8362fd908c623e5 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 15 Jul 2014 16:28:36 +0100 Subject: [PATCH] Added error message if user attempts to POST to multiple/add view without AJAX --- wagtail/wagtailimages/views/multiple.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/wagtail/wagtailimages/views/multiple.py b/wagtail/wagtailimages/views/multiple.py index caacd29959..e07a827c05 100644 --- a/wagtail/wagtailimages/views/multiple.py +++ b/wagtail/wagtailimages/views/multiple.py @@ -16,18 +16,21 @@ def add(request): Image = get_image_model() ImageForm = get_image_form_for_multi() - if request.POST and request.is_ajax(): + if request.POST: + if not request.is_ajax(): + return HttpResponseBadRequest("Cannot POST to this view without AJAX") + if not request.FILES: return HttpResponseBadRequest("Must upload a file") - else: - image = Image(uploaded_by_user=request.user, title=request.FILES['files[]'].name, file=request.FILES['files[]']) - image.save() - form = ImageForm(instance=image, prefix='image-%d'%image.id) - return render(request, 'wagtailimages/multiple/edit_form.html', { - 'image': image, - 'form': form - }) + image = Image(uploaded_by_user=request.user, title=request.FILES['files[]'].name, file=request.FILES['files[]']) + image.save() + form = ImageForm(instance=image, prefix='image-%d'%image.id) + + return render(request, 'wagtailimages/multiple/edit_form.html', { + 'image': image, + 'form': form + }) return render(request, 'wagtailimages/multiple/add.html', {})