Merge branch 'mope-268-fix-image-chooser-disappearing-search-box'

CHANGELOG.txt

@@ -29,6 +29,7 @@ Changelog
  * Fix: Eliminated raw SQL queries from wagtailcore / wagtailadmin, to ensure cross-database compatibility
  * Fix: Snippets menu item is hidden for administrators if no snippet types are defined
  * Fix: 'Upload' tab in image chooser now retains focus if submit action returns a form error.
+ * Fix: Search input now appears on image chooser after form validation error.
 
 0.2 (11.03.2014)
 ~~~~~~~~~~~~~~~~

wagtail/wagtailimages/views/chooser.py

@@ -113,6 +113,8 @@ def chooser_upload(request):
     Image = get_image_model()
     ImageForm = get_image_form()
 
+    searchform = SearchForm()
+
     if request.POST:
         image = Image(uploaded_by_user=request.user)
         form = ImageForm(request.POST, request.FILES, instance=image)
@@ -138,7 +140,7 @@ def chooser_upload(request):
 
     return render_modal_workflow(
         request, 'wagtailimages/chooser/chooser.html', 'wagtailimages/chooser/chooser.js',
-        {'images': images, 'uploadform': form}
+        {'images': images, 'uploadform': form, 'searchform': searchform}
     )