Merge branch 'kaedroho-es-fix'

CHANGELOG.txt

@@ -15,6 +15,7 @@ Changelog
  * 'boost' applied to the title field on searches reduced from 100 to 2
  * Fix: 'wagtail start' command now works on Windows
  * Fix: The external image URL generator no longer stores generated images in Django's cache
+ * Fix: Elasticsearch backend can now search querysets that have been filtered with an 'in' clause of a non-list type (such as a ValuesListQuerySet)
 
 0.6 (11.09.2014)
 ~~~~~~~~~~~~~~~~

docs/releases/0.7.rst

@@ -37,6 +37,7 @@ Bug fixes
 
  * The 'wagtail start' command now works on Windows and other environments where the ``django-admin.py`` executable is not readily accessible.
  * The external image URL generator no longer stores generated images in Django's cache; this was an unintentional side-effect of setting cache control headers.
+ * The Elasticsearch backend can now search querysets that have been filtered with an 'in' clause of a non-list type (such as a ``ValuesListQuerySet``).
 
 
 Upgrade considerations

wagtail/wagtailsearch/backends/elasticsearch.py

@@ -206,7 +206,7 @@ class ElasticSearchQuery(object):
         if lookup == 'in':
             return {
                 'terms': {
-                    field_index_name: value,
+                    field_index_name: list(value),
                 }
             }