From d778c3693d152d9c4965b3a02597c6494b077e81 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Thu, 19 Jun 2014 12:17:07 +0100
Subject: [PATCH 001/154] respect DOM re-ordering of formsets even if the
 parent form errored

---
 wagtail/wagtailadmin/edit_handlers.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py
index a15440016..d7a5726c3 100644
--- a/wagtail/wagtailadmin/edit_handlers.py
+++ b/wagtail/wagtailadmin/edit_handlers.py
@@ -562,6 +562,11 @@ class BaseInlinePanel(EditHandler):
                 child_edit_handler_class(instance=subform.instance, form=subform)
             )
 
+        # if this formset is valid, it may have been re-ordered; respect that
+        # in case the parent form errored and we need to re-render
+        if self.formset.can_order and self.formset.is_valid():
+            self.children = sorted(self.children, key=lambda x: x.form.cleaned_data['ORDER'])
+
         empty_form = self.formset.empty_form
         empty_form.fields['DELETE'].widget = forms.HiddenInput()
         if self.formset.can_order:

From 183c73c78a4080551cc63c4623dddc3d5dc30ffd Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Tue, 24 Jun 2014 11:50:44 +0100
Subject: [PATCH 002/154] Fix test_edit_handlers breaking other tests

---
 wagtail/wagtailadmin/tests/test_edit_handlers.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
index c930974fe..495a3ed41 100644
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -210,8 +210,10 @@ class TestBaseFieldPanel(TestCase):
 
     def setUp(self):
         fake_field = self.FakeField()
-        BaseFieldPanel.field_name = 'barbecue'
-        self.base_field_panel = BaseFieldPanel(
+        fake_base_field_panel = type('_FieldPanel',
+                                     (BaseFieldPanel,),
+                                     {'field_name': 'barbecue'})
+        self.base_field_panel = fake_base_field_panel(
             instance=True,
             form={'barbecue': fake_field})
 

From 085324c1b6e67a6bfa7b87d76fd3df375721e764 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Tue, 24 Jun 2014 14:30:23 +0100
Subject: [PATCH 003/154] Update snippets tests

Add an Advert fixture so that Advert objects do not need to be created
by the tests that use them.
---
 wagtail/tests/fixtures/test.json |  8 ++++++++
 wagtail/wagtailsnippets/tests.py | 23 +++++++++--------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json
index 11b82d9f1..31b47dfdd 100644
--- a/wagtail/tests/fixtures/test.json
+++ b/wagtail/tests/fixtures/test.json
@@ -418,5 +418,13 @@
         "page": 8,
         "submit_time": "2014-01-01T12:00:00.000Z"
     }
+},
+{
+    "pk": 1,
+    "model": "tests.advert",
+    "fields": {
+        "text": "test_advert",
+        "url": "http://www.example.com"
+    }
 }
 ]
diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py
index 1b1e012de..6e18b3ba4 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -78,12 +78,10 @@ class TestSnippetCreateView(TestCase, WagtailTestUtils):
 
 
 class TestSnippetEditView(TestCase, WagtailTestUtils):
-    def setUp(self):
-        self.test_snippet = Advert()
-        self.test_snippet.text = 'test_advert'
-        self.test_snippet.url = 'http://www.example.com/'
-        self.test_snippet.save()
+    fixtures = ['wagtail/tests/fixtures/test.json']
 
+    def setUp(self):
+        self.test_snippet = Advert.objects.get(id=1)
         self.login()
 
     def get(self, params={}):
@@ -127,12 +125,10 @@ class TestSnippetEditView(TestCase, WagtailTestUtils):
 
 
 class TestSnippetDelete(TestCase, WagtailTestUtils):
-    def setUp(self):
-        self.test_snippet = Advert()
-        self.test_snippet.text = 'test_advert'
-        self.test_snippet.url = 'http://www.example.com/'
-        self.test_snippet.save()
+    fixtures = ['wagtail/tests/fixtures/test.json']
 
+    def setUp(self):
+        self.test_snippet = Advert.objects.get(id=1)
         self.login()
 
     def test_delete_get(self):
@@ -151,14 +147,13 @@ class TestSnippetDelete(TestCase, WagtailTestUtils):
 
 
 class TestSnippetChooserPanel(TestCase):
+    fixtures = ['wagtail/tests/fixtures/test.json']
+
     def setUp(self):
         content_type = get_content_type_from_url_params('tests',
                                                         'advert')
 
-        test_snippet = Advert()
-        test_snippet.text = 'test_advert'
-        test_snippet.url = 'http://www.example.com/'
-        test_snippet.save()
+        test_snippet = Advert.objects.get(id=1)
 
         edit_handler_class = get_snippet_edit_handler(Advert)
         form_class = edit_handler_class.get_form_class(Advert)

From 4a922b990cc95406b9cb9e7d4f109ad8aca92ac1 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Wed, 2 Jul 2014 16:57:14 +0100
Subject: [PATCH 004/154] Fix wagtailsnippets.tests.TestSnippetChooserPanel

Fix wrong argument type passed to SnippetChooserPanel
---
 wagtail/wagtailsnippets/tests.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py
index 6e18b3ba4..ab9b2427d 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -150,9 +150,7 @@ class TestSnippetChooserPanel(TestCase):
     fixtures = ['wagtail/tests/fixtures/test.json']
 
     def setUp(self):
-        content_type = get_content_type_from_url_params('tests',
-                                                        'advert')
-
+        content_type = Advert
         test_snippet = Advert.objects.get(id=1)
 
         edit_handler_class = get_snippet_edit_handler(Advert)
@@ -170,7 +168,7 @@ class TestSnippetChooserPanel(TestCase):
         self.assertTrue('test_advert' in self.snippet_chooser_panel.render_as_field())
 
     def test_render_js(self):
-        self.assertTrue("createSnippetChooser(fixPrefix('id_text'), 'contenttypes/contenttype');"
+        self.assertTrue("createSnippetChooser(fixPrefix('id_text'), 'tests/advert');"
                         in self.snippet_chooser_panel.render_js())
 
 

From 1ce157ea432a32c737e2ad47e2b337bb699da61c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 3 Jul 2014 09:17:55 +0100
Subject: [PATCH 005/154] Added purge_url_from cache to
 wagtailfontendcache.utils

---
 wagtail/contrib/wagtailfrontendcache/utils.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/wagtail/contrib/wagtailfrontendcache/utils.py b/wagtail/contrib/wagtailfrontendcache/utils.py
index b95ed7e95..66b77c971 100644
--- a/wagtail/contrib/wagtailfrontendcache/utils.py
+++ b/wagtail/contrib/wagtailfrontendcache/utils.py
@@ -24,12 +24,17 @@ class CustomHTTPAdapter(HTTPAdapter):
         return super(CustomHTTPAdapter, self).get_connection(self.cache_url, proxies)
 
 
-def purge_page_from_cache(page):
+def purge_url_from_cache(url):
     # Get session
     cache_server_url = getattr(settings, 'WAGTAILFRONTENDCACHE_LOCATION', 'http://127.0.0.1:8000/')
     session = requests.Session()
     session.mount('http://', CustomHTTPAdapter(cache_server_url))
 
-    # Purge paths from cache
-    for path in page.get_cached_paths():
-        session.request('PURGE', page.full_url + path[1:])
+    # Send purge request to cache
+    session.request('PURGE', url)
+
+
+def purge_page_from_cache(page):
+    # Purge cached paths from cache
+    for path in page.specific.get_cached_paths():
+        purge_url_from_cache(page.full_url + path[1:])

From e4a9756c7942411c95588501427954fdf90f5814 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 3 Jul 2014 10:14:51 +0100
Subject: [PATCH 006/154] Added little section in the docs describing
 purge_url_from_cache

---
 docs/frontend_cache_purging.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/frontend_cache_purging.rst b/docs/frontend_cache_purging.rst
index a949bdc6e..e8564f6c1 100644
--- a/docs/frontend_cache_purging.rst
+++ b/docs/frontend_cache_purging.rst
@@ -100,3 +100,16 @@ Let's take the the above BlogIndexPage as an example. We need to register a sign
     @register(pre_delete, sender=BlogPage)
     def blog_deleted_handler(instance):
         blog_page_changed(instance)
+
+
+Purging individual URLs
+-----------------------
+
+``wagtail.contrib.wagtailfrontendcache.utils`` provides another utils function called ``purge_url_from_cache``. As the name suggests, this purges an individual URL from the cache.
+
+.. code-block:: python
+
+    from wagtail.contrib.wagtailfrontendcache.utils import purge_url_from_cache
+
+    # Purge the homepage
+    purge_url_from_cache(homepage.full_url)

From bba9d4faf29c7a8b84e557223174f6930f0cc378 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 12:41:51 +0100
Subject: [PATCH 007/154] Added new search configuration format

---
 wagtail/wagtailadmin/taggable.py | 21 ++++-------
 wagtail/wagtailcore/models.py    | 25 +++++--------
 wagtail/wagtaildocs/models.py    | 12 +++----
 wagtail/wagtailimages/models.py  | 12 +++----
 wagtail/wagtailsearch/indexed.py | 60 ++++++++++++++++++++++++++++++++
 wagtail/wagtailsearch/models.py  | 15 +++++---
 6 files changed, 94 insertions(+), 51 deletions(-)

diff --git a/wagtail/wagtailadmin/taggable.py b/wagtail/wagtailadmin/taggable.py
index 39213e956..91c36ca7f 100644
--- a/wagtail/wagtailadmin/taggable.py
+++ b/wagtail/wagtailadmin/taggable.py
@@ -4,27 +4,20 @@ from django.contrib.contenttypes.models import ContentType
 from django.db.models import Count
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
-from wagtail.wagtailsearch import Indexed, get_search_backend
+from wagtail.wagtailsearch import indexed
+from wagtail.wagtailsearch.backends import get_search_backend
 
 
-class TagSearchable(Indexed):
+class TagSearchable(indexed.Indexed):
     """
     Mixin to provide a 'search' method, searching on the 'title' field and tags,
     for models that provide those things.
     """
 
-    indexed_fields = {
-        'title': {
-            'type': 'string',
-            'analyzer': 'edgengram_analyzer',
-            'boost': 10,
-        },
-        'get_tags': {
-            'type': 'string',
-            'analyzer': 'edgengram_analyzer',
-            'boost': 10,
-        },
-    }
+    search_fields = (
+        indexed.SearchField('title', partial_match=True, boost=10),
+        indexed.SearchField('get_tags', partial_match=True, boost=10)
+    )
 
     @property
     def get_tags(self):
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 7f3070615..4964966a3 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -28,7 +28,8 @@ from treebeard.mp_tree import MP_Node
 from wagtail.wagtailcore.utils import camelcase_to_underscore
 from wagtail.wagtailcore.query import PageQuerySet
 
-from wagtail.wagtailsearch import Indexed, get_search_backend
+from wagtail.wagtailsearch import indexed
+from wagtail.wagtailsearch.backends import get_search_backend
 
 
 class SiteManager(models.Manager):
@@ -260,7 +261,7 @@ class PageBase(models.base.ModelBase):
 
 
 @python_2_unicode_compatible
-class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
+class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, indexed.Indexed)):
     title = models.CharField(max_length=255, help_text=_("The page title as you'd like it to be seen by the public"))
     slug = models.SlugField(help_text=_("The name of the page as it will appear in URLs e.g http://domain.com/blog/[my-slug]/"))
     # TODO: enforce uniqueness on slug field per parent (will have to be done at the Django
@@ -279,21 +280,11 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
     expire_at = models.DateTimeField(verbose_name=_("Expiry date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True)
     expired = models.BooleanField(default=False, editable=False)
 
-    indexed_fields = {
-        'title': {
-            'type': 'string',
-            'analyzer': 'edgengram_analyzer',
-            'boost': 100,
-        },
-        'live': {
-            'type': 'boolean',
-            'index': 'not_analyzed',
-        },
-        'path': {
-            'type': 'string',
-            'index': 'not_analyzed',
-        },
-    }
+    search_fields = (
+        indexed.SearchField('title', partial_match=True, boost=100),
+        indexed.FilterField('live'),
+        indexed.FilterField('path'),
+    )
 
     def __init__(self, *args, **kwargs):
         super(Page, self).__init__(*args, **kwargs)
diff --git a/wagtail/wagtaildocs/models.py b/wagtail/wagtaildocs/models.py
index a87b9c02b..513c0ede0 100644
--- a/wagtail/wagtaildocs/models.py
+++ b/wagtail/wagtaildocs/models.py
@@ -12,6 +12,7 @@ from django.utils.translation import ugettext_lazy  as _
 from django.utils.encoding import python_2_unicode_compatible
 
 from wagtail.wagtailadmin.taggable import TagSearchable
+from wagtail.wagtailsearch import indexed
 
 
 @python_2_unicode_compatible
@@ -23,14 +24,9 @@ class Document(models.Model, TagSearchable):
 
     tags = TaggableManager(help_text=None, blank=True, verbose_name=_('Tags'))
 
-    indexed_fields = {
-        'uploaded_by_user_id': {
-            'type': 'integer',
-            'store': 'yes',
-            'indexed': 'no',
-            'boost': 0,
-        },
-    }
+    search_fields = TagSearchable.search_fields + (
+        indexed.FilterField('uploaded_by_user'),
+    )
 
     def __str__(self):
         return self.title
diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py
index db73b048a..c561cdcc5 100644
--- a/wagtail/wagtailimages/models.py
+++ b/wagtail/wagtailimages/models.py
@@ -20,6 +20,7 @@ from unidecode import unidecode
 
 from wagtail.wagtailadmin.taggable import TagSearchable
 from wagtail.wagtailimages.backends import get_image_backend
+from wagtail.wagtailsearch import indexed
 from .utils import validate_image_format
 
 
@@ -48,14 +49,9 @@ class AbstractImage(models.Model, TagSearchable):
 
     tags = TaggableManager(help_text=None, blank=True, verbose_name=_('Tags'))
 
-    indexed_fields = {
-        'uploaded_by_user_id': {
-            'type': 'integer',
-            'store': 'yes',
-            'indexed': 'no',
-            'boost': 0,
-        },
-    }
+    search_fields = TagSearchable.search_fields + (
+        indexed.FilterField('uploaded_by_user'),
+    )
 
     def __str__(self):
         return self.title
diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index b53481727..e2817905d 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -35,6 +35,11 @@ class Indexed(object):
 
     @classmethod
     def indexed_get_indexed_fields(cls):
+        # New way
+        if hasattr(cls, 'search_fields'):
+            return dict((field.get_attname(cls), field.to_dict(cls)) for field in cls.search_fields)
+
+        # Old way
         # Get indexed fields for this class as dictionary
         indexed_fields = cls.indexed_fields
         if isinstance(indexed_fields, dict):
@@ -83,3 +88,58 @@ class Indexed(object):
         return doc
 
     indexed_fields = ()
+
+
+class BaseField(object):
+    def __init__(self, field_name, **kwargs):
+        self.field_name = field_name
+        self.kwargs = kwargs
+
+    def get_field(self, cls):
+        return cls._meta.get_field_by_name(self.field_name)[0]
+
+    def get_attname(self, cls):
+        try:
+            field = self.get_field(cls)
+            return field.attname
+        except models.fields.FieldDoesNotExist:
+            return self.field_name
+
+    def to_dict(self, cls):
+        dic = {
+            'type': 'string'
+        }
+
+        if 'es_extra' in self.kwargs:
+            for key, value in self.kwargs['es_extra'].items():
+                dic[key] = value
+
+        return dic
+
+
+class SearchField(BaseField):
+    def __init__(self, field_name, boost=None, partial_match=False, **kwargs):
+        super(SearchField, self).__init__(field_name, **kwargs)
+        self.boost = boost
+        self.partial_match = partial_match
+
+    def to_dict(self, cls):
+        dic = super(SearchField, self).to_dict(cls)
+
+        if self.boost and 'boost' not in dic:
+            dic['boost'] = self.boost
+
+        if self.partial_match and 'analyzer' not in dic:
+            dic['analyzer'] = 'edgengram_analyzer'
+
+        return dic
+
+
+class FilterField(BaseField):
+    def to_dict(self, cls):
+        dic = super(FilterField, self).to_dict(cls)
+
+        if 'index' not in dic:
+            dic['index'] = 'not_analyzed'
+
+        return dic
diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py
index abb479295..509368463 100644
--- a/wagtail/wagtailsearch/models.py
+++ b/wagtail/wagtailsearch/models.py
@@ -4,7 +4,7 @@ from django.db import models
 from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible
 
-from wagtail.wagtailsearch.indexed import Indexed
+from wagtail.wagtailsearch import indexed
 from wagtail.wagtailsearch.utils import normalise_query_string, MAX_QUERY_STRING_LENGTH
 
 
@@ -82,12 +82,17 @@ class EditorsPick(models.Model):
 
 # Used for tests
 
-class SearchTest(models.Model, Indexed):
+class SearchTest(models.Model, indexed.Indexed):
     title = models.CharField(max_length=255)
     content = models.TextField()
     live = models.BooleanField(default=False)
 
-    indexed_fields = ("title", "content", "callable_indexed_field", "live")
+    search_fields = (
+        indexed.SearchField('title'),
+        indexed.SearchField('content'),
+        indexed.SearchField('callable_indexed_field'),
+        indexed.SearchField('live'),
+    )
 
     def callable_indexed_field(self):
         return "Callable"
@@ -96,4 +101,6 @@ class SearchTest(models.Model, Indexed):
 class SearchTestChild(SearchTest):
     extra_content = models.TextField()
 
-    indexed_fields = "extra_content"
+    search_fields = SearchTest.search_fields + (
+        indexed.SearchField('extra_content'),
+    )

From 5c64172d02fc2fded5f4ed990f62fa836c5302c3 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 13:44:54 +0100
Subject: [PATCH 008/154] Created ElasticSearchMapping class

---
 .../wagtailsearch/backends/elasticsearch.py   | 92 ++++++++++++-------
 1 file changed, 59 insertions(+), 33 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 91536d744..82e76d5fc 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -12,6 +12,40 @@ from wagtail.wagtailsearch.indexed import Indexed
 from wagtail.wagtailsearch.utils import normalise_query_string
 
 
+class ElasticSearchMapping(object):
+    def __init__(self, model):
+        self.model = model
+
+    def get_document_type(self):
+        return self.model.indexed_get_content_type()
+
+    def get_mapping(self):
+        # Get type name
+        content_type = self.get_document_type()
+
+        # Get indexed fields
+        indexed_fields = self.model.indexed_get_indexed_fields()
+
+        # Make field list
+        fields = {
+            'pk': dict(type='string', index='not_analyzed', store='yes'),
+            'content_type': dict(type='string'),
+        }
+        fields.update(indexed_fields)
+
+        return {
+            content_type: {
+                'properties': fields,
+            }
+        }
+
+    def get_document_id(self, obj):
+        return obj.indexed_build_document()['id']
+
+    def get_document(self, obj):
+        return obj.indexed_build_document()
+
+
 class ElasticSearchQuery(object):
     def __init__(self, model, query_string, fields=None, filters={}):
         self.model = model
@@ -330,25 +364,11 @@ class ElasticSearch(BaseSearch):
         self.es.indices.create(self.es_index, INDEX_SETTINGS)
 
     def add_type(self, model):
-        # Get type name
-        content_type = model.indexed_get_content_type()
-
-        # Get indexed fields
-        indexed_fields = model.indexed_get_indexed_fields()
-
-        # Make field list
-        fields = {
-            "pk": dict(type="string", index="not_analyzed", store="yes"),
-            "content_type": dict(type="string"),
-        }
-        fields.update(indexed_fields)
+        # Get mapping
+        mapping = ElasticSearchMapping(model)
 
         # Put mapping
-        self.es.indices.put_mapping(index=self.es_index, doc_type=content_type, body={
-            content_type: {
-                "properties": fields,
-            }
-        })
+        self.es.indices.put_mapping(index=self.es_index, doc_type=mapping.get_document_type(), body=mapping.get_mapping())
 
     def refresh_index(self):
         self.es.indices.refresh(self.es_index)
@@ -358,11 +378,11 @@ class ElasticSearch(BaseSearch):
         if not self.object_can_be_indexed(obj):
             return
 
-        # Build document
-        doc = obj.indexed_build_document()
+        # Get mapping
+        mapping = ElasticSearchMapping(obj.__class__)
 
-        # Add to index
-        self.es.index(self.es_index, obj.indexed_get_content_type(), doc, id=doc["id"])
+        # Add document to index
+        self.es.index(self.es_index, mapping.get_document_type(), mapping.get_document(obj), id=mapping.get_document_id(obj))
 
     def add_bulk(self, obj_list):
         # Group all objects by their type
@@ -372,27 +392,30 @@ class ElasticSearch(BaseSearch):
             if not self.object_can_be_indexed(obj):
                 continue
 
-            # Get object type
-            obj_type = obj.indexed_get_content_type()
+            # Get mapping
+            mapping = ElasticSearchMapping(obj.__class__)
+
+            # Get document type
+            doc_type = mapping.get_document_type()
 
             # If type is currently not in set, add it
-            if obj_type not in type_set:
-                type_set[obj_type] = []
+            if doc_type not in type_set:
+                type_set[doc_type] = []
 
-            # Add object to set
-            type_set[obj_type].append(obj.indexed_build_document())
+            # Add document to set
+            type_set[doc_type].append((mapping.get_document_id(obj), mapping.get_document(obj)))
 
         # Loop through each type and bulk add them
-        for type_name, type_objects in type_set.items():
+        for type_name, type_documents in type_set.items():
             # Get list of actions
             actions = []
-            for obj in type_objects:
+            for doc_id, doc in type_documents:
                 action = {
                     '_index': self.es_index,
                     '_type': type_name,
-                    '_id': obj['id'],
+                    '_id': doc_id,
                 }
-                action.update(obj)
+                action.update(doc)
                 actions.append(action)
 
             bulk(self.es, actions)
@@ -402,12 +425,15 @@ class ElasticSearch(BaseSearch):
         if not isinstance(obj, Indexed) or not isinstance(obj, models.Model):
             return
 
+        # Get mapping
+        mapping = ElasticSearchMapping(obj.__class__)
+
         # Delete document
         try:
             self.es.delete(
                 self.es_index,
-                obj.indexed_get_content_type(),
-                obj.indexed_get_document_id(),
+                mapping.get_document_type(),
+                mapping.get_document_id(obj),
             )
         except NotFoundError:
             pass  # Document doesn't exist, ignore this exception

From fefa8c79ef7660d789f109a444ebe2b9fc8b43f8 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 13:51:35 +0100
Subject: [PATCH 009/154] Added repr to ElasticSearchMapping

---
 wagtail/wagtailsearch/backends/elasticsearch.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 82e76d5fc..9ad1f288a 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -45,6 +45,9 @@ class ElasticSearchMapping(object):
     def get_document(self, obj):
         return obj.indexed_build_document()
 
+    def __repr__(self):
+        return '<ElasticSearchMapping: %s>' % (self.model.__name__, )
+
 
 class ElasticSearchQuery(object):
     def __init__(self, model, query_string, fields=None, filters={}):

From da9b7c2408474583d66bf1be274e9a0831f36a40 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 13:55:09 +0100
Subject: [PATCH 010/154] Moved document building methods from indexed into
 ElasticSearchMapping

---
 .../wagtailsearch/backends/elasticsearch.py   | 19 ++++++++++++++--
 wagtail/wagtailsearch/indexed.py              | 22 -------------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 9ad1f288a..bbdbf0ecd 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -40,10 +40,25 @@ class ElasticSearchMapping(object):
         }
 
     def get_document_id(self, obj):
-        return obj.indexed_build_document()['id']
+        return obj.indexed_get_toplevel_content_type() + ':' + str(obj.pk)
 
     def get_document(self, obj):
-        return obj.indexed_build_document()
+        # Get content type, indexed fields and id
+        content_type = obj.indexed_get_content_type()
+        indexed_fields = obj.indexed_get_indexed_fields()
+
+        # Build document
+        doc = dict(pk=str(obj.pk), content_type=content_type)
+        for field in indexed_fields.keys():
+            if hasattr(obj, field):
+                doc[field] = getattr(obj, field)
+
+                # Check if this field is callable
+                if hasattr(doc[field], "__call__"):
+                    # Call it
+                    doc[field] = doc[field]()
+
+        return doc
 
     def __repr__(self):
         return '<ElasticSearchMapping: %s>' % (self.model.__name__, )
diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index e2817905d..929bd0dbe 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -65,28 +65,6 @@ class Indexed(object):
             indexed_fields = parent_indexed_fields
         return indexed_fields
 
-    def indexed_get_document_id(self):
-        return self.indexed_get_toplevel_content_type() + ":" + str(self.pk)
-
-    def indexed_build_document(self):
-        # Get content type, indexed fields and id
-        content_type = self.indexed_get_content_type()
-        indexed_fields = self.indexed_get_indexed_fields()
-        doc_id = self.indexed_get_document_id()
-
-        # Build document
-        doc = dict(pk=str(self.pk), content_type=content_type, id=doc_id)
-        for field in indexed_fields.keys():
-            if hasattr(self, field):
-                doc[field] = getattr(self, field)
-
-                # Check if this field is callable
-                if hasattr(doc[field], "__call__"):
-                    # Call it
-                    doc[field] = doc[field]()
-
-        return doc
-
     indexed_fields = ()
 
 

From e81a9f6c6b3aed2a78ea16890dd34930b1f85ab9 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 14:56:56 +0100
Subject: [PATCH 011/154] Added repr to indexed.BaseField

---
 wagtail/wagtailsearch/indexed.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index 929bd0dbe..334bb30da 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -94,6 +94,9 @@ class BaseField(object):
 
         return dic
 
+    def __repr__(self):
+        return "<%s: %s>" % (self.__class__.__name__, self.field_name)
+
 
 class SearchField(BaseField):
     def __init__(self, field_name, boost=None, partial_match=False, **kwargs):

From 3c5a065a3601ff5b23df8ac9081dc5c88a532234 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 15:00:57 +0100
Subject: [PATCH 012/154] SearchFields configuration is now used in the
 backends Previously, we just converted them to make them look like
 indexed_fields. We now convert indexed_fields into SearchFields objects and
 pass them to the backend.

---
 wagtail/wagtailsearch/backends/db.py          |  2 +-
 .../wagtailsearch/backends/elasticsearch.py   | 20 ++-----
 wagtail/wagtailsearch/indexed.py              | 56 +++++++++++++++++--
 3 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py
index 214c71cb3..a7dca12e9 100644
--- a/wagtail/wagtailsearch/backends/db.py
+++ b/wagtail/wagtailsearch/backends/db.py
@@ -38,7 +38,7 @@ class DBSearch(BaseSearch):
 
         # Get fields
         if fields is None:
-            fields = model.indexed_get_indexed_fields().keys()
+            fields = [field.field_name for field in model.get_searchable_search_fields()]
 
         # Start will all objects
         query = model.objects.all()
diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index bbdbf0ecd..28127fe83 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -20,21 +20,17 @@ class ElasticSearchMapping(object):
         return self.model.indexed_get_content_type()
 
     def get_mapping(self):
-        # Get type name
-        content_type = self.get_document_type()
-
-        # Get indexed fields
-        indexed_fields = self.model.indexed_get_indexed_fields()
-
         # Make field list
         fields = {
             'pk': dict(type='string', index='not_analyzed', store='yes'),
             'content_type': dict(type='string'),
         }
-        fields.update(indexed_fields)
+
+        for field in self.model.get_search_fields():
+            fields[field.get_attname(self.model)] = field.to_dict(self.model)
 
         return {
-            content_type: {
+            self.get_document_type(): {
                 'properties': fields,
             }
         }
@@ -43,13 +39,9 @@ class ElasticSearchMapping(object):
         return obj.indexed_get_toplevel_content_type() + ':' + str(obj.pk)
 
     def get_document(self, obj):
-        # Get content type, indexed fields and id
-        content_type = obj.indexed_get_content_type()
-        indexed_fields = obj.indexed_get_indexed_fields()
-
         # Build document
-        doc = dict(pk=str(obj.pk), content_type=content_type)
-        for field in indexed_fields.keys():
+        doc = dict(pk=str(obj.pk), content_type=self.model.indexed_get_content_type())
+        for field in [field.get_attname(self.model) for field in self.model.get_search_fields()]:
             if hasattr(obj, field):
                 doc[field] = getattr(obj, field)
 
diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index 334bb30da..b4e67f4c1 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -1,3 +1,5 @@
+import warnings
+
 from six import string_types
 
 from django.db import models
@@ -35,11 +37,6 @@ class Indexed(object):
 
     @classmethod
     def indexed_get_indexed_fields(cls):
-        # New way
-        if hasattr(cls, 'search_fields'):
-            return dict((field.get_attname(cls), field.to_dict(cls)) for field in cls.search_fields)
-
-        # Old way
         # Get indexed fields for this class as dictionary
         indexed_fields = cls.indexed_fields
         if isinstance(indexed_fields, dict):
@@ -65,10 +62,57 @@ class Indexed(object):
             indexed_fields = parent_indexed_fields
         return indexed_fields
 
+    @classmethod
+    def get_search_fields(cls):
+        search_fields = []
+
+        if hasattr(cls, 'search_fields'):
+            search_fields.extend(cls.search_fields)
+
+        # Backwards compatibility with old indexed_fields setting
+
+        # Get indexed fields
+        indexed_fields = cls.indexed_get_indexed_fields()
+
+        # Display deprecation warning if indexed_fields has been used
+        if indexed_fields:
+            warnings.warn("'indexed_fields' setting is now deprecated."
+                          "Use 'search_fields' instead.", DeprecationWarning)
+
+        # Convert them into search fields
+        for field_name, _config in indexed_fields.items():
+            # Copy the config to prevent is trashing anything accidentally
+            config = _config.copy()
+
+            # Check if this is a filter field
+            if config.get('index', None) == 'not_analyzed':
+                config.pop('index')
+                search_fields.append(FilterField(field_name, es_extra=config))
+                continue
+
+            # Must be a search field, check for boosting and partial matching
+            boost = config.pop('boost', None)
+
+            partial_match = False
+            if config.get('analyzer', None) == 'edgengram_analyzer':
+                partial_match = True
+                config.pop('analyzer')
+
+            # Add the field
+            search_fields.append(SearchField(field_name, boost=boost, partial_match=partial_match, es_extra=config))
+
+        return search_fields
+
+    @classmethod
+    def get_searchable_search_fields(cls):
+        return filter(lambda field: field.searchable, cls.get_search_fields())
+
     indexed_fields = ()
 
 
 class BaseField(object):
+    searchable = False
+
     def __init__(self, field_name, **kwargs):
         self.field_name = field_name
         self.kwargs = kwargs
@@ -99,6 +143,8 @@ class BaseField(object):
 
 
 class SearchField(BaseField):
+    searchable = True
+
     def __init__(self, field_name, boost=None, partial_match=False, **kwargs):
         super(SearchField, self).__init__(field_name, **kwargs)
         self.boost = boost

From 8bb3703c6eea10e4e02abab134d03131ec68e1d8 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 15:09:31 +0100
Subject: [PATCH 013/154] Created get_field_mapping method on
 ElasticSearchMapping class

---
 wagtail/wagtailsearch/backends/elasticsearch.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 28127fe83..ac8ee068b 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -19,6 +19,9 @@ class ElasticSearchMapping(object):
     def get_document_type(self):
         return self.model.indexed_get_content_type()
 
+    def get_field_mapping(self, field):
+        return field.get_attname(self.model), field.to_dict(self.model)
+
     def get_mapping(self):
         # Make field list
         fields = {
@@ -26,8 +29,9 @@ class ElasticSearchMapping(object):
             'content_type': dict(type='string'),
         }
 
-        for field in self.model.get_search_fields():
-            fields[field.get_attname(self.model)] = field.to_dict(self.model)
+        fields.update(dict(
+            self.get_field_mapping(field) for field in self.model.get_search_fields()
+        ))
 
         return {
             self.get_document_type(): {

From 0aca9ece6576640cfd8bac0b508f3a2ffde3ce8b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 15:29:09 +0100
Subject: [PATCH 014/154] Moved field mapping generation code into
 ElasticSearchMapping class

---
 .../wagtailsearch/backends/elasticsearch.py   | 19 +++++++++--
 wagtail/wagtailsearch/indexed.py              | 32 +++----------------
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index ac8ee068b..88542f624 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -8,7 +8,7 @@ from elasticsearch import Elasticsearch, NotFoundError, RequestError
 from elasticsearch.helpers import bulk
 
 from wagtail.wagtailsearch.backends.base import BaseSearch
-from wagtail.wagtailsearch.indexed import Indexed
+from wagtail.wagtailsearch.indexed import Indexed, SearchField, FilterField
 from wagtail.wagtailsearch.utils import normalise_query_string
 
 
@@ -20,7 +20,22 @@ class ElasticSearchMapping(object):
         return self.model.indexed_get_content_type()
 
     def get_field_mapping(self, field):
-        return field.get_attname(self.model), field.to_dict(self.model)
+        mapping = {'type': 'string'}
+
+        if isinstance(field, SearchField):
+            if field.boost:
+                mapping['boost'] = field.boost
+
+            if field.partial_match:
+                mapping['analyzer'] = 'edgengram_analyzer'
+        elif isinstance(field, FilterField):
+            mapping['index'] = 'not_analyzed'
+
+        if 'es_extra' in field.kwargs:
+            for key, value in field.kwargs['es_extra'].items():
+                mapping[key] = value
+
+        return field.get_index_name(self.model), mapping
 
     def get_mapping(self):
         # Make field list
diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index b4e67f4c1..347e41c0c 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -112,6 +112,7 @@ class Indexed(object):
 
 class BaseField(object):
     searchable = False
+    suffix = ''
 
     def __init__(self, field_name, **kwargs):
         self.field_name = field_name
@@ -127,16 +128,8 @@ class BaseField(object):
         except models.fields.FieldDoesNotExist:
             return self.field_name
 
-    def to_dict(self, cls):
-        dic = {
-            'type': 'string'
-        }
-
-        if 'es_extra' in self.kwargs:
-            for key, value in self.kwargs['es_extra'].items():
-                dic[key] = value
-
-        return dic
+    def get_index_name(self, cls):
+        return self.get_attname(cls) + self.suffix
 
     def __repr__(self):
         return "<%s: %s>" % (self.__class__.__name__, self.field_name)
@@ -150,23 +143,6 @@ class SearchField(BaseField):
         self.boost = boost
         self.partial_match = partial_match
 
-    def to_dict(self, cls):
-        dic = super(SearchField, self).to_dict(cls)
-
-        if self.boost and 'boost' not in dic:
-            dic['boost'] = self.boost
-
-        if self.partial_match and 'analyzer' not in dic:
-            dic['analyzer'] = 'edgengram_analyzer'
-
-        return dic
-
 
 class FilterField(BaseField):
-    def to_dict(self, cls):
-        dic = super(FilterField, self).to_dict(cls)
-
-        if 'index' not in dic:
-            dic['index'] = 'not_analyzed'
-
-        return dic
+    suffix = '_filter'

From 5e76a54b2b4046b4a6a177c04c3ad8fc3bc345fe Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 15:36:10 +0100
Subject: [PATCH 015/154] Remove any duplicate search fields of the same type

---
 wagtail/wagtailsearch/indexed.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index 347e41c0c..aba3003f7 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -101,6 +101,13 @@ class Indexed(object):
             # Add the field
             search_fields.append(SearchField(field_name, boost=boost, partial_match=partial_match, es_extra=config))
 
+        # Remove any duplicate entries into search fields
+        # We need to take into account that fields can be indexed as both a SearchField and as a FilterField
+        search_fields_dict = {}
+        for field in search_fields:
+            search_fields_dict[(field.field_name, type(field))] = field
+        search_fields = search_fields_dict.values()
+
         return search_fields
 
     @classmethod

From 6d21727b034a1f0147c1be987aab27e4728a5199 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 15:48:51 +0100
Subject: [PATCH 016/154] Cleaned up database backend search method

---
 wagtail/wagtailsearch/backends/db.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py
index a7dca12e9..5ed8e07df 100644
--- a/wagtail/wagtailsearch/backends/db.py
+++ b/wagtail/wagtailsearch/backends/db.py
@@ -49,7 +49,7 @@ class DBSearch(BaseSearch):
 
         # Filter by terms
         for term in terms:
-            term_query = None
+            term_query = models.Q()
             for field_name in fields:
                 # Check if the field exists (this will filter out indexed callables)
                 try:
@@ -58,11 +58,8 @@ class DBSearch(BaseSearch):
                     continue
 
                 # Filter on this field
-                field_filter = {'%s__icontains' % field_name: term}
-                if term_query is None:
-                    term_query = models.Q(**field_filter)
-                else:
-                    term_query |= models.Q(**field_filter)
+                term_query |= models.Q(**{'%s__icontains' % field_name: term})
+
             query = query.filter(term_query)
 
         # Distinct

From 67ed563dd74602a1cfb79b2d1e274c3c8aa8cf2d Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 15:52:06 +0100
Subject: [PATCH 017/154] Made quotes more consistant

---
 .../wagtailsearch/backends/elasticsearch.py   | 62 +++++++++----------
 wagtail/wagtailsearch/indexed.py              |  4 +-
 .../management/commands/update_index.py       |  6 +-
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 88542f624..4890b5e52 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -65,7 +65,7 @@ class ElasticSearchMapping(object):
                 doc[field] = getattr(obj, field)
 
                 # Check if this field is callable
-                if hasattr(doc[field], "__call__"):
+                if hasattr(doc[field], '__call__'):
                     # Call it
                     doc[field] = doc[field]()
 
@@ -346,43 +346,43 @@ class ElasticSearch(BaseSearch):
 
         # Settings
         INDEX_SETTINGS = {
-            "settings": {
-                "analysis": {
-                    "analyzer": {
-                        "ngram_analyzer": {
-                            "type": "custom",
-                            "tokenizer": "lowercase",
-                            "filter": ["ngram"]
+            'settings': {
+                'analysis': {
+                    'analyzer': {
+                        'ngram_analyzer': {
+                            'type': 'custom',
+                            'tokenizer': 'lowercase',
+                            'filter': ['ngram']
                         },
-                        "edgengram_analyzer": {
-                            "type": "custom",
-                            "tokenizer": "lowercase",
-                            "filter": ["edgengram"]
+                        'edgengram_analyzer': {
+                            'type': 'custom',
+                            'tokenizer': 'lowercase',
+                            'filter': ['edgengram']
                         }
                     },
-                    "tokenizer": {
-                        "ngram_tokenizer": {
-                            "type": "nGram",
-                            "min_gram": 3,
-                            "max_gram": 15,
+                    'tokenizer': {
+                        'ngram_tokenizer': {
+                            'type': 'nGram',
+                            'min_gram': 3,
+                            'max_gram': 15,
                         },
-                        "edgengram_tokenizer": {
-                            "type": "edgeNGram",
-                            "min_gram": 2,
-                            "max_gram": 15,
-                            "side": "front"
+                        'edgengram_tokenizer': {
+                            'type': 'edgeNGram',
+                            'min_gram': 2,
+                            'max_gram': 15,
+                            'side': 'front'
                         }
                     },
-                    "filter": {
-                        "ngram": {
-                            "type": "nGram",
-                            "min_gram": 3,
-                            "max_gram": 15
+                    'filter': {
+                        'ngram': {
+                            'type': 'nGram',
+                            'min_gram': 3,
+                            'max_gram': 15
                         },
-                        "edgengram": {
-                            "type": "edgeNGram",
-                            "min_gram": 1,
-                            "max_gram": 15
+                        'edgengram': {
+                            'type': 'edgeNGram',
+                            'min_gram': 1,
+                            'max_gram': 15
                         }
                     }
                 }
diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index aba3003f7..b4626914f 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -49,7 +49,7 @@ class Indexed(object):
             if isinstance(indexed_fields, string_types):
                 indexed_fields = [indexed_fields]
             if isinstance(indexed_fields, list):
-                indexed_fields = dict((field, dict(type="string")) for field in indexed_fields)
+                indexed_fields = dict((field, dict(type='string')) for field in indexed_fields)
             if not isinstance(indexed_fields, dict):
                 raise ValueError()
 
@@ -139,7 +139,7 @@ class BaseField(object):
         return self.get_attname(cls) + self.suffix
 
     def __repr__(self):
-        return "<%s: %s>" % (self.__class__.__name__, self.field_name)
+        return '<%s: %s>' % (self.__class__.__name__, self.field_name)
 
 
 class SearchField(BaseField):
diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py
index 8f1605b24..ee85da8ff 100644
--- a/wagtail/wagtailsearch/management/commands/update_index.py
+++ b/wagtail/wagtailsearch/management/commands/update_index.py
@@ -25,13 +25,13 @@ class Command(BaseCommand):
 
             # Loop through objects
             for obj in model.objects.all():
-                # Check if this object has an "object_indexed" function
-                if hasattr(obj, "object_indexed"):
+                # Check if this object has an 'object_indexed' function
+                if hasattr(obj, 'object_indexed'):
                     if obj.object_indexed() is False:
                         continue
 
                 # Get key for this object
-                key = toplevel_content_type + ":" + str(obj.pk)
+                key = toplevel_content_type + ':' + str(obj.pk)
 
                 # Check if this key already exists
                 if key in object_set:

From f2d1c803783a4e69e84d46b5f87dd58b41cfc770 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 6 Apr 2014 14:21:40 +0100
Subject: [PATCH 018/154] Don't run tests with wagtailsearch signal handlers
 enabled

---
 wagtail/tests/urls.py                        |  4 ----
 wagtail/wagtailsearch/tests/test_backends.py | 10 +++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py
index 83e12adfb..385d0e6cf 100644
--- a/wagtail/tests/urls.py
+++ b/wagtail/tests/urls.py
@@ -6,10 +6,6 @@ from wagtail.wagtaildocs import urls as wagtaildocs_urls
 from wagtail.wagtailsearch.urls import frontend as wagtailsearch_frontend_urls
 from wagtail.contrib.wagtailsitemaps.views import sitemap
 
-# Signal handlers
-from wagtail.wagtailsearch import register_signal_handlers as wagtailsearch_register_signal_handlers
-wagtailsearch_register_signal_handlers()
-
 
 urlpatterns = patterns('',
     url(r'^admin/', include(wagtailadmin_urls)),
diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py
index 8fab1d152..86a67f21a 100644
--- a/wagtail/wagtailsearch/tests/test_backends.py
+++ b/wagtail/wagtailsearch/tests/test_backends.py
@@ -11,11 +11,6 @@ from wagtail.wagtailsearch.backends.db import DBSearch
 from wagtail.wagtailsearch.backends import InvalidSearchBackendError
 
 
-# Register wagtailsearch signal handlers
-from wagtail.wagtailsearch import register_signal_handlers
-register_signal_handlers()
-
-
 class BackendTests(object):
     # To test a specific backend, subclass BackendTests and define self.backend_path.
 
@@ -41,21 +36,25 @@ class BackendTests(object):
         testa = models.SearchTest()
         testa.title = "Hello World"
         testa.save()
+        self.backend.add(testa)
         self.testa = testa
 
         testb = models.SearchTest()
         testb.title = "Hello"
         testb.live = True
         testb.save()
+        self.backend.add(testb)
 
         testc = models.SearchTestChild()
         testc.title = "Hello"
         testc.live = True
         testc.save()
+        self.backend.add(testc)
 
         testd = models.SearchTestChild()
         testd.title = "World"
         testd.save()
+        self.backend.add(testd)
 
         # Refresh the index
         self.backend.refresh_index()
@@ -130,6 +129,7 @@ class BackendTests(object):
 
     def test_delete(self):
         # Delete one of the objects
+        self.backend.delete(self.testa)
         self.testa.delete()
 
         # Refresh index

From 6847109bb994580e67ca33ba93f1c382ab81ec6e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 29 Apr 2014 11:54:02 +0100
Subject: [PATCH 019/154] Removed 'object_indexed' check from update_index
 command

Conflicts:
	wagtail/wagtailsearch/management/commands/update_index.py
---
 wagtail/wagtailsearch/management/commands/update_index.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py
index ee85da8ff..0b4cb695f 100644
--- a/wagtail/wagtailsearch/management/commands/update_index.py
+++ b/wagtail/wagtailsearch/management/commands/update_index.py
@@ -25,11 +25,6 @@ class Command(BaseCommand):
 
             # Loop through objects
             for obj in model.objects.all():
-                # Check if this object has an 'object_indexed' function
-                if hasattr(obj, 'object_indexed'):
-                    if obj.object_indexed() is False:
-                        continue
-
                 # Get key for this object
                 key = toplevel_content_type + ':' + str(obj.pk)
 

From b1fb9dc2e249024961323d6f34ce4ee970a698fe Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 15:59:39 +0100
Subject: [PATCH 020/154] Fixed a few more double quotes

---
 wagtail/wagtailsearch/indexed.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index b4626914f..4b636497b 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -15,13 +15,13 @@ class Indexed(object):
     @classmethod
     def indexed_get_content_type(cls):
         # Work out content type
-        content_type = (cls._meta.app_label + "_" + cls.__name__).lower()
+        content_type = (cls._meta.app_label + '_' + cls.__name__).lower()
 
         # Get parent content type
         parent = cls.indexed_get_parent()
         if parent:
             parent_content_type = parent.indexed_get_content_type()
-            return parent_content_type + "_" + content_type
+            return parent_content_type + '_' + content_type
         else:
             return content_type
 
@@ -33,7 +33,7 @@ class Indexed(object):
             return parent.indexed_get_content_type()
         else:
             # At toplevel, return this content type
-            return (cls._meta.app_label + "_" + cls.__name__).lower()
+            return (cls._meta.app_label + '_' + cls.__name__).lower()
 
     @classmethod
     def indexed_get_indexed_fields(cls):

From 4a70a4251b7ec5140351f7d2f255d3ccfc81894b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 6 Apr 2014 14:41:40 +0100
Subject: [PATCH 021/154] Give some feedback from the add_bulk command

---
 wagtail/wagtailsearch/backends/db.py                      | 4 ++--
 wagtail/wagtailsearch/backends/elasticsearch.py           | 1 +
 wagtail/wagtailsearch/management/commands/update_index.py | 6 ++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py
index 5ed8e07df..4c05b19df 100644
--- a/wagtail/wagtailsearch/backends/db.py
+++ b/wagtail/wagtailsearch/backends/db.py
@@ -22,7 +22,7 @@ class DBSearch(BaseSearch):
         pass # Not needed
 
     def add_bulk(self, obj_list):
-        pass # Not needed
+        return [] # Not needed
 
     def delete(self, obj):
         pass # Not needed
@@ -70,4 +70,4 @@ class DBSearch(BaseSearch):
             for prefetch in prefetch_related:
                 query = query.prefetch_related(prefetch)
 
-        return query
\ No newline at end of file
+        return query
diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 4890b5e52..dbe755ff1 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -447,6 +447,7 @@ class ElasticSearch(BaseSearch):
                 action.update(doc)
                 actions.append(action)
 
+            yield type_name, len(type_documents)
             bulk(self.es, actions)
 
     def delete(self, obj):
diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py
index 0b4cb695f..2c1593635 100644
--- a/wagtail/wagtailsearch/management/commands/update_index.py
+++ b/wagtail/wagtailsearch/management/commands/update_index.py
@@ -57,10 +57,8 @@ class Command(BaseCommand):
 
         # Add objects to index
         self.stdout.write("Adding objects")
-        results = s.add_bulk(object_set.values())
-        if results:
-            for result in results:
-                self.stdout.write(result[0] + ' ' + str(result[1]))
+        for result in s.add_bulk(object_set.values()):
+            self.stdout.write(result[0] + ' ' + str(result[1]))
 
         # Refresh index
         self.stdout.write("Refreshing index")

From 673da4ab021eb7f2fa14d9e194d12689373ba9c5 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 17:19:32 +0100
Subject: [PATCH 022/154] Set index:'not_analysed' setting on content_type
 field

---
 wagtail/wagtailsearch/backends/elasticsearch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index dbe755ff1..8fb706bba 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -41,7 +41,7 @@ class ElasticSearchMapping(object):
         # Make field list
         fields = {
             'pk': dict(type='string', index='not_analyzed', store='yes'),
-            'content_type': dict(type='string'),
+            'content_type': dict(type='string', index='not_analyzed'),
         }
 
         fields.update(dict(

From 584f5a7049a587f1da398ad421f9afd40a13fde8 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 16:22:35 +0100
Subject: [PATCH 023/154] Index fields with correct type in ElasticSearch

Previously, everything was converted to a string before indexing in ElasticSearch.
This caused issues where certian filters may not work as expected (such as a greater than filter on an integer field)

This commit changes this by adding type conversion into the ElasticSearch backend.
---
 .../wagtailsearch/backends/elasticsearch.py   | 38 ++++++++++++++-----
 wagtail/wagtailsearch/indexed.py              | 20 ++++++++++
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 8fb706bba..7ffebd045 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -13,6 +13,32 @@ from wagtail.wagtailsearch.utils import normalise_query_string
 
 
 class ElasticSearchMapping(object):
+    TYPE_MAP = {
+        'AutoField': 'integer',
+        'BinaryField': 'binary',
+        'BooleanField': 'boolean',
+        'CharField': 'string',
+        'CommaSeparatedIntegerField': 'string',
+        'DateField': 'date',
+        'DateTimeField': 'date',
+        'DecimalField': 'double',
+        'FileField': 'string',
+        'FilePathField': 'string',
+        'FloatField': 'double',
+        'IntegerField': 'integer',
+        'BigIntegerField': 'long',
+        'IPAddressField': 'string',
+        'GenericIPAddressField': 'string',
+        'NullBooleanField': 'boolean',
+        'OneToOneField': 'integer',
+        'PositiveIntegerField': 'integer',
+        'PositiveSmallIntegerField': 'integer',
+        'SlugField': 'string',
+        'SmallIntegerField': 'integer',
+        'TextField': 'string',
+        'TimeField': 'date',
+    }
+
     def __init__(self, model):
         self.model = model
 
@@ -20,7 +46,7 @@ class ElasticSearchMapping(object):
         return self.model.indexed_get_content_type()
 
     def get_field_mapping(self, field):
-        mapping = {'type': 'string'}
+        mapping = {'type': self.TYPE_MAP.get(field.get_type(self.model), 'string')}
 
         if isinstance(field, SearchField):
             if field.boost:
@@ -60,14 +86,8 @@ class ElasticSearchMapping(object):
     def get_document(self, obj):
         # Build document
         doc = dict(pk=str(obj.pk), content_type=self.model.indexed_get_content_type())
-        for field in [field.get_attname(self.model) for field in self.model.get_search_fields()]:
-            if hasattr(obj, field):
-                doc[field] = getattr(obj, field)
-
-                # Check if this field is callable
-                if hasattr(doc[field], '__call__'):
-                    # Call it
-                    doc[field] = doc[field]()
+        for field in self.model.get_search_fields():
+            doc[field.get_index_name(self.model)] = field.get_value(obj)
 
         return doc
 
diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index 4b636497b..b290f440b 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -138,6 +138,26 @@ class BaseField(object):
     def get_index_name(self, cls):
         return self.get_attname(cls) + self.suffix
 
+    def get_type(self, cls):
+        if 'type' in self.kwargs:
+            return self.kwargs['type']
+
+        try:
+            field = self.get_field(cls)
+            return field.get_internal_type()
+        except models.fields.FieldDoesNotExist:
+            return 'CharField'
+
+    def get_value(self, obj):
+        try:
+            field = self.get_field(obj.__class__)
+            return field._get_val_from_obj(obj)
+        except models.fields.FieldDoesNotExist:
+            value = getattr(obj, self.field_name, None)
+            if hasattr(value, '__call__'):
+                value = value()
+            return value
+
     def __repr__(self):
         return '<%s: %s>' % (self.__class__.__name__, self.field_name)
 

From de3f852e4320e6b1211b2660fa3b60a08377210e Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Thu, 3 Jul 2014 11:41:23 +0100
Subject: [PATCH 024/154] Removed EditHandler tests. Added more FieldPanel
 tests

---
 .../wagtailadmin/tests/test_edit_handlers.py  | 133 ++++++------------
 1 file changed, 44 insertions(+), 89 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
index 53afbd349..fa9f3f650 100644
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -63,70 +63,6 @@ class TestExtractPanelDefinitionsFromModelClass(TestCase):
             self.assertTrue(issubclass(panel, BaseFieldPanel))
 
 
-class TestEditHandler(TestCase):
-    class FakeForm(dict):
-        def __init__(self, *args, **kwargs):
-            self.fields = self.fields_iterator()
-
-        def fields_iterator(self):
-            for i in self:
-                yield i
-
-    def setUp(self):
-        self.edit_handler = EditHandler(form=True, instance=True)
-        self.edit_handler.render = lambda: "foo"
-
-    def test_widget_overrides(self):
-        result = EditHandler.widget_overrides()
-        self.assertEqual(result, {})
-
-    def test_required_formsets(self):
-        result = EditHandler.required_formsets()
-        self.assertEqual(result, [])
-
-    def test_get_form_class(self):
-        result = EditHandler.get_form_class(Page)
-        self.assertTrue(issubclass(result, WagtailAdminModelForm))
-
-    def test_edit_handler_init_no_instance(self):
-        self.assertRaises(ValueError, EditHandler, form=True)
-
-    def test_edit_handler_init_no_form(self):
-        self.assertRaises(ValueError, EditHandler, instance=True)
-
-    def test_field_type(self):
-        result = self.edit_handler.field_type()
-        self.assertEqual(result, "")
-
-    def test_render_as_object(self):
-        result = self.edit_handler.render_as_object()
-        self.assertEqual(result, "foo")
-
-    def test_render_as_field(self):
-        result = self.edit_handler.render_as_field()
-        self.assertEqual(result, "foo")
-
-    def test_render_js(self):
-        result = self.edit_handler.render_js()
-        self.assertEqual(result, "")
-
-    def test_rendered_fields(self):
-        result = self.edit_handler.rendered_fields()
-        self.assertEqual(result, [])
-
-    def test_render_missing_fields(self):
-        fake_form = self.FakeForm()
-        fake_form["foo"] = "bar"
-        self.edit_handler.form = fake_form
-        self.assertEqual(self.edit_handler.render_missing_fields(), "bar")
-
-    def test_render_form_content(self):
-        fake_form = self.FakeForm()
-        fake_form["foo"] = "bar"
-        self.edit_handler.form = fake_form
-        self.assertEqual(self.edit_handler.render_form_content(), "foobar")
-
-
 class TestTabbedInterface(TestCase):
     class FakeChild(object):
         class FakeGrandchild(object):
@@ -183,34 +119,10 @@ class TestObjectList(TestCase):
         self.assertTrue(issubclass(object_list, BaseObjectList))
 
 
-class TestBaseFieldPanel(TestCase):
-    class FakeClass(object):
-        required = False
-
-    class FakeField(object):
-        label = 'label'
-        help_text = 'help text'
-
-    def setUp(self):
-        fake_field = self.FakeField()
-        fake_base_field_panel = type('_FieldPanel',
-                                     (BaseFieldPanel,),
-                                     {'field_name': 'barbecue'})
-        self.base_field_panel = fake_base_field_panel(
-            instance=True,
-            form={'barbecue': fake_field})
-
-    def test_field_type(self):
-        fake_object = self.FakeClass()
-        another_fake_object = self.FakeClass()
-        fake_object.field = another_fake_object
-        self.base_field_panel.bound_field = fake_object
-        self.assertEqual(self.base_field_panel.field_type(), 'fake_class')
-
-
 class TestFieldPanel(TestCase):
     class FakeClass(object):
         required = False
+        widget = 'fake widget'
 
     class FakeField(object):
         label = 'label'
@@ -218,6 +130,14 @@ class TestFieldPanel(TestCase):
         errors = ['errors']
         id_for_label = 'id for label'
 
+    class FakeForm(dict):
+        def __init__(self, *args, **kwargs):
+            self.fields = self.fields_iterator()
+
+        def fields_iterator(self):
+            for i in self:
+                yield i
+
     def setUp(self):
         fake_field = self.FakeField()
         fake_field.field = self.FakeClass()
@@ -258,6 +178,41 @@ class TestFieldPanel(TestCase):
         result = self.field_panel.rendered_fields()
         self.assertEqual(result, ['barbecue'])
 
+    def test_field_type(self):
+        fake_object = self.FakeClass()
+        another_fake_object = self.FakeClass()
+        fake_object.field = another_fake_object
+        self.field_panel.bound_field = fake_object
+        self.assertEqual(self.field_panel.field_type(), 'fake_class')
+
+    def test_widget_overrides(self):
+        result = self.field_panel.widget_overrides()
+        self.assertEqual(result, {})
+
+    def test_required_formsets(self):
+        result = self.field_panel.required_formsets()
+        self.assertEqual(result, [])
+
+    def test_get_form_class(self):
+        result = self.field_panel.get_form_class(Page)
+        self.assertTrue(issubclass(result, WagtailAdminModelForm))
+
+    def test_render_js(self):
+        result = self.field_panel.render_js()
+        self.assertEqual(result, "")
+
+    def test_render_missing_fields(self):
+        fake_form = self.FakeForm()
+        fake_form["foo"] = "bar"
+        self.field_panel.form = fake_form
+        self.assertEqual(self.field_panel.render_missing_fields(), "bar")
+
+    def test_render_form_content(self):
+        fake_form = self.FakeForm()
+        fake_form["foo"] = "bar"
+        self.field_panel.form = fake_form
+        self.assertIn("bar", self.field_panel.render_form_content())
+
 
 class TestRichTextFieldPanel(TestCase):
     class FakeField(object):

From e1721030dcb8391617af28c3e4f04503862eb1b1 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 17:13:34 +0100
Subject: [PATCH 025/154] Exclude filter fields from _all. Explicitly include
 search fields in _all

---
 wagtail/wagtailsearch/backends/elasticsearch.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 7ffebd045..5e9e6e984 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -54,8 +54,11 @@ class ElasticSearchMapping(object):
 
             if field.partial_match:
                 mapping['analyzer'] = 'edgengram_analyzer'
+
+            mapping['include_in_all'] = True
         elif isinstance(field, FilterField):
             mapping['index'] = 'not_analyzed'
+            mapping['include_in_all'] = False
 
         if 'es_extra' in field.kwargs:
             for key, value in field.kwargs['es_extra'].items():
@@ -66,8 +69,8 @@ class ElasticSearchMapping(object):
     def get_mapping(self):
         # Make field list
         fields = {
-            'pk': dict(type='string', index='not_analyzed', store='yes'),
-            'content_type': dict(type='string', index='not_analyzed'),
+            'pk': dict(type='string', index='not_analyzed', store='yes', include_in_all=False),
+            'content_type': dict(type='string', index='not_analyzed', include_in_all=False),
         }
 
         fields.update(dict(

From ca1fa1d93341f21f60d0fdde943c062f5c4b343c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 20 Jun 2014 17:32:06 +0100
Subject: [PATCH 026/154] Index partials together into '_partials'

---
 wagtail/wagtailsearch/backends/elasticsearch.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 5e9e6e984..8fc2950dd 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -71,6 +71,7 @@ class ElasticSearchMapping(object):
         fields = {
             'pk': dict(type='string', index='not_analyzed', store='yes', include_in_all=False),
             'content_type': dict(type='string', index='not_analyzed', include_in_all=False),
+            '_partials': dict(type='string', analyzer='edgengram_analyzer', include_in_all=False),
         }
 
         fields.update(dict(
@@ -89,8 +90,18 @@ class ElasticSearchMapping(object):
     def get_document(self, obj):
         # Build document
         doc = dict(pk=str(obj.pk), content_type=self.model.indexed_get_content_type())
+        partials = []
         for field in self.model.get_search_fields():
-            doc[field.get_index_name(self.model)] = field.get_value(obj)
+            value = field.get_value(obj)
+
+            doc[field.get_index_name(self.model)] = value
+
+            # Check if this field should be added into _partials
+            if isinstance(field, SearchField) and field.partial_match:
+                partials.append(value)
+
+        # Add partials to document
+        doc['_partials'] = partials
 
         return doc
 
@@ -102,7 +113,7 @@ class ElasticSearchQuery(object):
     def __init__(self, model, query_string, fields=None, filters={}):
         self.model = model
         self.query_string = query_string
-        self.fields = fields or ['_all']
+        self.fields = fields or ['_all', '_partials']
         self.filters = filters
 
     def _get_filters(self):

From b15522ac1e08dd18af9a9988f619eed9e0e22f20 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 15:49:19 +0100
Subject: [PATCH 027/154] Implemented search on queryset

---
 .../wagtailsearch/backends/elasticsearch.py   | 204 ++++++++++++------
 wagtail/wagtailsearch/indexed.py              |   9 +-
 wagtail/wagtailsearch/models.py               |   2 +-
 3 files changed, 146 insertions(+), 69 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 8fc2950dd..a8c590de2 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -3,6 +3,7 @@ from __future__ import absolute_import
 import json
 
 from django.db import models
+from django.db.models.query import QuerySet
 
 from elasticsearch import Elasticsearch, NotFoundError, RequestError
 from elasticsearch.helpers import bulk
@@ -109,12 +110,123 @@ class ElasticSearchMapping(object):
         return '<ElasticSearchMapping: %s>' % (self.model.__name__, )
 
 
+class FilterError(Exception):
+    pass
+
+
+class FieldError(Exception):
+    pass
+
+
 class ElasticSearchQuery(object):
-    def __init__(self, model, query_string, fields=None, filters={}):
-        self.model = model
+    def __init__(self, queryset, query_string, fields=None):
+        self.queryset = queryset
         self.query_string = query_string
-        self.fields = fields or ['_all', '_partials']
-        self.filters = filters
+        self.fields = fields or ['_all', 'partials']
+
+    def _get_filters_from_where(self, where_node):
+        # Check if this is a leaf node
+        if isinstance(where_node, tuple):
+            field_name = where_node[0].col
+            lookup = where_node[1]
+            value = where_node[3]
+
+            # Get field
+            field = dict(
+                (field.get_attname(self.queryset.model), field)
+                for field in self.queryset.model.get_filterable_search_fields()
+            ).get(field_name, None)
+
+            # Give error if the field doesn't exist
+            if field is None:
+                raise FieldError('Cannot filter ElasticSearch results with field "' + field_name + '". Please add FilterField(\'' + field_name + '\') to ' + self.queryset.model.__name__ + '.search_fields.')
+
+            # Get the name of the field in the index
+            field_index_name = field.get_index_name(self.queryset.model)
+
+            # Find lookup
+            if lookup == 'exact':
+                if value is None:
+                    return {
+                        'missing': {
+                            'field': field_index_name,
+                        }
+                    }
+                else:
+                    return {
+                        'term': {
+                            field_index_name: value,
+                        }
+                    }
+
+            if lookup == 'isnull':
+                if value:
+                    return {
+                        'missing': {
+                            'field': field_index_name,
+                        }
+                    }
+                else:
+                    return {
+                        'not': {
+                            'missing': {
+                                'field': field_index_name,
+                            }
+                        }
+                    }
+
+            if lookup in ['startswith', 'prefix']:
+                return {
+                    'prefix': {
+                        field_index_name: value,
+                    }
+                }
+
+            if lookup in ['gt', 'gte', 'lt', 'lte']:
+                return {
+                    'range': {
+                        field_index_name: {
+                            lookup: value,
+                        }
+                    }
+                }
+
+            if lookup == 'range':
+                lower, upper = value
+
+                return {
+                    'range': {
+                        field_index_name: {
+                            'gte': lower,
+                            'lte': upper,
+                        }
+                    }
+                }
+
+            raise FilterError('Could not apply filter on ElasticSearch results "' + field_name + '__' + lookup + ' = ' + unicode(value) + '". Lookup "' + lookup + '"" not recognosed.')
+
+        # Get child filters
+        connector = where_node.connector
+        child_filters = [self._get_filters_from_where(child) for child in where_node.children]
+        child_filters = [child_filter for child_filter in child_filters if child_filter]
+
+        # Connect them
+        if child_filters:
+            if len(child_filters) == 1:
+                filter_out = child_filters[0]
+            else:
+                filter_out = {
+                    connector.lower(): [
+                        fil for fil in child_filters if fil is not None
+                    ]
+                }
+
+            if where_node.negated:
+                filter_out = {
+                    'not': filter_out
+                }
+
+            return filter_out
 
     def _get_filters(self):
         # Filters
@@ -123,59 +235,14 @@ class ElasticSearchQuery(object):
         # Filter by content type
         filters.append({
             'prefix': {
-                'content_type': self.model.indexed_get_content_type()
+                'content_type': self.queryset.model.indexed_get_content_type()
             }
         })
 
-        # Extra filters
-        if self.filters:
-            for key, value in self.filters.items():
-                if '__' in key:
-                    field, lookup = key.split('__')
-                else:
-                    field = key
-                    lookup = None
-
-                if lookup is None:
-                    if value is None:
-                        filters.append({
-                            'missing': {
-                                'field': field,
-                            }
-                        })
-                    else:
-                        filters.append({
-                            'term': {
-                                field: value
-                            }
-                        })
-
-                if lookup in ['startswith', 'prefix']:
-                    filters.append({
-                        'prefix': {
-                            field: value
-                        }
-                    })
-
-                if lookup in ['gt', 'gte', 'lt', 'lte']:
-                    filters.append({
-                        'range': {
-                            field: {
-                                lookup: value,
-                            }
-                        }
-                    })
-
-                if lookup == 'range':
-                    lower, upper = value
-                    filters.append({
-                        'range': {
-                            field: {
-                                'gte': lower,
-                                'lte': upper,
-                            }
-                        }
-                    })
+        # Apply filters from queryset
+        queryset_filters = self._get_filters_from_where(self.queryset.query.where)
+        if queryset_filters:
+            filters.append(queryset_filters)
 
         return filters
 
@@ -263,15 +330,8 @@ class ElasticSearchResults(object):
         # Initialise results dictionary
         results = dict((str(pk), None) for pk in pks)
 
-        # Get queryset
-        queryset = self.query.model.objects.filter(pk__in=pks)
-
-        # Add prefetch related
-        if self.prefetch_related:
-            for prefetch in self.prefetch_related:
-                queryset = queryset.prefetch_related(prefetch)
-
         # Find objects in database and add them to dict
+        queryset = self.query.queryset.filter(pk__in=pks)
         for obj in queryset:
             results[str(obj.pk)] = obj
 
@@ -502,7 +562,15 @@ class ElasticSearch(BaseSearch):
         except NotFoundError:
             pass  # Document doesn't exist, ignore this exception
 
-    def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]):
+    def search(self, query_string, model_or_queryset, fields=None, filters={}, prefetch_related=[]):
+        # Find model/queryset
+        if isinstance(model_or_queryset, QuerySet):
+            model = model_or_queryset.model
+            queryset = model_or_queryset
+        else:
+            model = model_or_queryset
+            queryset = model_or_queryset.objects.all()
+
         # Model must be a descendant of Indexed and be a django model
         if not issubclass(model, Indexed) or not issubclass(model, models.Model):
             return []
@@ -514,5 +582,13 @@ class ElasticSearch(BaseSearch):
         if not query_string:
             return []
 
+        # Apply filters to queryset
+        if filters:
+            queryset = queryset.filter(**filters)
+
+        # Prefetch related
+        for prefetch in prefetch_related:
+            queryset = queryset.prefetch_related(prefetch)
+
         # Return search results
-        return ElasticSearchResults(self, ElasticSearchQuery(model, query_string, fields=fields, filters=filters), prefetch_related=prefetch_related)
+        return ElasticSearchResults(self, ElasticSearchQuery(queryset, query_string, fields=fields))
diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index b290f440b..a2cb54d14 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -112,13 +112,16 @@ class Indexed(object):
 
     @classmethod
     def get_searchable_search_fields(cls):
-        return filter(lambda field: field.searchable, cls.get_search_fields())
+        return filter(lambda field: isinstance(field, SearchField), cls.get_search_fields())
+
+    @classmethod
+    def get_filterable_search_fields(cls):
+        return filter(lambda field: isinstance(field, FilterField), cls.get_search_fields())
 
     indexed_fields = ()
 
 
 class BaseField(object):
-    searchable = False
     suffix = ''
 
     def __init__(self, field_name, **kwargs):
@@ -163,8 +166,6 @@ class BaseField(object):
 
 
 class SearchField(BaseField):
-    searchable = True
-
     def __init__(self, field_name, boost=None, partial_match=False, **kwargs):
         super(SearchField, self).__init__(field_name, **kwargs)
         self.boost = boost
diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py
index 509368463..7cb8546d7 100644
--- a/wagtail/wagtailsearch/models.py
+++ b/wagtail/wagtailsearch/models.py
@@ -91,7 +91,7 @@ class SearchTest(models.Model, indexed.Indexed):
         indexed.SearchField('title'),
         indexed.SearchField('content'),
         indexed.SearchField('callable_indexed_field'),
-        indexed.SearchField('live'),
+        indexed.FilterField('live'),
     )
 
     def callable_indexed_field(self):

From 41199dd576ee9a4ad3ed5cbf414e655499bb2088 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 15:51:29 +0100
Subject: [PATCH 028/154] Minor optimisation in ElasticSearchQuery

---
 .../wagtailsearch/backends/elasticsearch.py   | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index a8c590de2..649a7a7f0 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -260,15 +260,24 @@ class ElasticSearchQuery(object):
 
         # Filters
         filters = self._get_filters()
-
-        return {
-            'filtered': {
-                'query': query,
-                'filter': {
-                    'and': filters,
+        if len(filters) == 1:
+            query = {
+                'filtered': {
+                    'query': query,
+                    'filter': filters[0],
                 }
             }
-        }
+        elif len(filters) > 1:
+            query = {
+                'filtered': {
+                    'query': query,
+                    'filter': {
+                        'and': filters,
+                    }
+                }
+            }
+
+        return query
 
     def __repr__(self):
         return json.dumps(self.to_es())

From d872768baffe4f6aa2e66ad92a82f1a3f075d69e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 16:01:04 +0100
Subject: [PATCH 029/154] Allow query_string to be set to None This allows
 match_all queries to be created

---
 wagtail/wagtailsearch/backends/db.py          | 47 ++++++++++---------
 .../wagtailsearch/backends/elasticsearch.py   | 24 ++++++----
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py
index 4c05b19df..c91363740 100644
--- a/wagtail/wagtailsearch/backends/db.py
+++ b/wagtail/wagtailsearch/backends/db.py
@@ -28,42 +28,43 @@ class DBSearch(BaseSearch):
         pass # Not needed
 
     def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]):
-        # Normalise query string
-        query_string = normalise_query_string(query_string)
-
-        # Get terms
-        terms = query_string.split()
-        if not terms:
-            return model.objects.none()
-
         # Get fields
         if fields is None:
             fields = [field.field_name for field in model.get_searchable_search_fields()]
 
-        # Start will all objects
+        # Start with all objects
         query = model.objects.all()
 
         # Apply filters
         if filters:
             query = query.filter(**filters)
 
-        # Filter by terms
-        for term in terms:
-            term_query = models.Q()
-            for field_name in fields:
-                # Check if the field exists (this will filter out indexed callables)
-                try:
-                    model._meta.get_field_by_name(field_name)
-                except:
-                    continue
+        if query_string is not None:
+            # Normalise query string
+            query_string = normalise_query_string(query_string)
 
-                # Filter on this field
-                term_query |= models.Q(**{'%s__icontains' % field_name: term})
+            # Get terms
+            terms = query_string.split()
+            if not terms:
+                return model.objects.none()
 
-            query = query.filter(term_query)
+            # Filter by terms
+            for term in terms:
+                term_query = models.Q()
+                for field_name in fields:
+                    # Check if the field exists (this will filter out indexed callables)
+                    try:
+                        model._meta.get_field_by_name(field_name)
+                    except:
+                        continue
 
-        # Distinct
-        query = query.distinct()
+                    # Filter on this field
+                    term_query |= models.Q(**{'%s__icontains' % field_name: term})
+
+                query = query.filter(term_query)
+
+            # Distinct
+            query = query.distinct()
 
         # Prefetch related
         if prefetch_related:
diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 649a7a7f0..af810b02b 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -248,15 +248,20 @@ class ElasticSearchQuery(object):
 
     def to_es(self):
         # Query
-        query = {
-            'query_string': {
-                'query': self.query_string,
+        if self.query_string is not None:
+            query = {
+                'query_string': {
+                    'query': self.query_string,
+                }
             }
-        }
 
-        # Fields
-        if self.fields:
-            query['query_string']['fields'] = self.fields
+            # Fields
+            if self.fields:
+                query['query_string']['fields'] = self.fields
+        else:
+            query = {
+                'match_all': {}
+            }
 
         # Filters
         filters = self._get_filters()
@@ -585,10 +590,11 @@ class ElasticSearch(BaseSearch):
             return []
 
         # Normalise query string
-        query_string = normalise_query_string(query_string)
+        if query_string is not None:
+            query_string = normalise_query_string(query_string)
 
         # Check that theres still a query string after the clean up
-        if not query_string:
+        if query_string == "":
             return []
 
         # Apply filters to queryset

From 156eb89850e1efdcdc2b6fc31fb74681441098dd Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 16:10:50 +0100
Subject: [PATCH 030/154] Changed default values of filters and
 prefetch_related to None

---
 wagtail/wagtailsearch/backends/db.py            | 2 +-
 wagtail/wagtailsearch/backends/elasticsearch.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py
index c91363740..56536e343 100644
--- a/wagtail/wagtailsearch/backends/db.py
+++ b/wagtail/wagtailsearch/backends/db.py
@@ -27,7 +27,7 @@ class DBSearch(BaseSearch):
     def delete(self, obj):
         pass # Not needed
 
-    def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]):
+    def search(self, query_string, model, fields=None, filters=None, prefetch_related=None):
         # Get fields
         if fields is None:
             fields = [field.field_name for field in model.get_searchable_search_fields()]
diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index af810b02b..14b1a3bdb 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -576,7 +576,7 @@ class ElasticSearch(BaseSearch):
         except NotFoundError:
             pass  # Document doesn't exist, ignore this exception
 
-    def search(self, query_string, model_or_queryset, fields=None, filters={}, prefetch_related=[]):
+    def search(self, query_string, model_or_queryset, fields=None, filters=None, prefetch_related=None):
         # Find model/queryset
         if isinstance(model_or_queryset, QuerySet):
             model = model_or_queryset.model
@@ -602,8 +602,9 @@ class ElasticSearch(BaseSearch):
             queryset = queryset.filter(**filters)
 
         # Prefetch related
-        for prefetch in prefetch_related:
-            queryset = queryset.prefetch_related(prefetch)
+        if prefetch_related:
+            for prefetch in prefetch_related:
+                queryset = queryset.prefetch_related(prefetch)
 
         # Return search results
         return ElasticSearchResults(self, ElasticSearchQuery(queryset, query_string, fields=fields))

From 8a99a63cf1df057e126d6a4d841f8af05ad97644 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 17:37:18 +0100
Subject: [PATCH 031/154] Fixed typo

---
 wagtail/wagtailsearch/backends/elasticsearch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 14b1a3bdb..ea0413eed 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -122,7 +122,7 @@ class ElasticSearchQuery(object):
     def __init__(self, queryset, query_string, fields=None):
         self.queryset = queryset
         self.query_string = query_string
-        self.fields = fields or ['_all', 'partials']
+        self.fields = fields or ['_all', '_partials']
 
     def _get_filters_from_where(self, where_node):
         # Check if this is a leaf node

From 2100c6372d0761a920cf22c62dffb9ed7d58c7b6 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 16:45:01 +0100
Subject: [PATCH 032/154] Moved wagtailsearch test models into wagtail.tests
 models

---
 wagtail/tests/models.py                       |  25 ++++
 ...to__del_searchtestchild__del_searchtest.py | 112 ++++++++++++++++++
 wagtail/wagtailsearch/models.py               |  26 ----
 wagtail/wagtailsearch/tests/test_backends.py  |   4 +-
 4 files changed, 139 insertions(+), 28 deletions(-)
 create mode 100644 wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index ff6dc2dcc..5787c19ff 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -11,6 +11,7 @@ from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
 from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel
 from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField
 from wagtail.wagtailsnippets.models import register_snippet
+from wagtail.wagtailsearch import indexed
 
 
 EVENT_AUDIENCE_CHOICES = (
@@ -316,3 +317,27 @@ class BusinessSubIndex(Page):
 
 class BusinessChild(Page):
     subpage_types = []
+
+
+class SearchTest(models.Model, indexed.Indexed):
+    title = models.CharField(max_length=255)
+    content = models.TextField()
+    live = models.BooleanField(default=False)
+
+    search_fields = (
+        indexed.SearchField('title'),
+        indexed.SearchField('content'),
+        indexed.SearchField('callable_indexed_field'),
+        indexed.FilterField('live'),
+    )
+
+    def callable_indexed_field(self):
+        return "Callable"
+
+
+class SearchTestChild(SearchTest):
+    extra_content = models.TextField()
+
+    search_fields = SearchTest.search_fields + (
+        indexed.SearchField('extra_content'),
+    )
diff --git a/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py b/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py
new file mode 100644
index 000000000..560dbaae9
--- /dev/null
+++ b/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting model 'SearchTestChild'
+        db.delete_table(u'wagtailsearch_searchtestchild')
+
+        # Deleting model 'SearchTest'
+        db.delete_table(u'wagtailsearch_searchtest')
+
+
+    def backwards(self, orm):
+        # Adding model 'SearchTestChild'
+        db.create_table(u'wagtailsearch_searchtestchild', (
+            ('extra_content', self.gf('django.db.models.fields.TextField')()),
+            (u'searchtest_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['wagtailsearch.SearchTest'], unique=True, primary_key=True)),
+        ))
+        db.send_create_signal(u'wagtailsearch', ['SearchTestChild'])
+
+        # Adding model 'SearchTest'
+        db.create_table(u'wagtailsearch_searchtest', (
+            ('content', self.gf('django.db.models.fields.TextField')()),
+            ('live', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal(u'wagtailsearch', ['SearchTest'])
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'wagtailcore.page': {
+            'Meta': {'object_name': 'Page'},
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}),
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['auth.User']"}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        u'wagtailsearch.editorspick': {
+            'Meta': {'ordering': "('sort_order',)", 'object_name': 'EditorsPick'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['wagtailcore.Page']"}),
+            'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editors_picks'", 'to': u"orm['wagtailsearch.Query']"}),
+            'sort_order': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        u'wagtailsearch.query': {
+            'Meta': {'object_name': 'Query'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'query_string': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
+        },
+        u'wagtailsearch.querydailyhits': {
+            'Meta': {'unique_together': "(('query', 'date'),)", 'object_name': 'QueryDailyHits'},
+            'date': ('django.db.models.fields.DateField', [], {}),
+            'hits': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'daily_hits'", 'to': u"orm['wagtailsearch.Query']"})
+        }
+    }
+
+    complete_apps = ['wagtailsearch']
\ No newline at end of file
diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py
index 7cb8546d7..c63a076a7 100644
--- a/wagtail/wagtailsearch/models.py
+++ b/wagtail/wagtailsearch/models.py
@@ -78,29 +78,3 @@ class EditorsPick(models.Model):
 
     class Meta:
         ordering = ('sort_order', )
-
-
-# Used for tests
-
-class SearchTest(models.Model, indexed.Indexed):
-    title = models.CharField(max_length=255)
-    content = models.TextField()
-    live = models.BooleanField(default=False)
-
-    search_fields = (
-        indexed.SearchField('title'),
-        indexed.SearchField('content'),
-        indexed.SearchField('callable_indexed_field'),
-        indexed.FilterField('live'),
-    )
-
-    def callable_indexed_field(self):
-        return "Callable"
-
-
-class SearchTestChild(SearchTest):
-    extra_content = models.TextField()
-
-    search_fields = SearchTest.search_fields + (
-        indexed.SearchField('extra_content'),
-    )
diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py
index 86a67f21a..04d28689a 100644
--- a/wagtail/wagtailsearch/tests/test_backends.py
+++ b/wagtail/wagtailsearch/tests/test_backends.py
@@ -6,9 +6,9 @@ from django.conf import settings
 from django.core import management
 
 from wagtail.tests.utils import unittest
-from wagtail.wagtailsearch import models, get_search_backend
+from wagtail.tests import models
+from wagtail.wagtailsearch.backends import get_search_backend, InvalidSearchBackendError
 from wagtail.wagtailsearch.backends.db import DBSearch
-from wagtail.wagtailsearch.backends import InvalidSearchBackendError
 
 
 class BackendTests(object):

From 2679dc2fe69fbf08423d727c19e16a19c068ffbb Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 16:51:06 +0100
Subject: [PATCH 033/154] Split up backend tests

---
 wagtail/wagtailsearch/tests/test_backends.py  | 21 -------------------
 .../wagtailsearch/tests/test_db_backend.py    | 13 ++++++++++++
 .../tests/test_elasticsearch_backend.py       | 18 ++++++++++++++++
 3 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 wagtail/wagtailsearch/tests/test_db_backend.py
 create mode 100644 wagtail/wagtailsearch/tests/test_elasticsearch_backend.py

diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py
index 04d28689a..e9b656298 100644
--- a/wagtail/wagtailsearch/tests/test_backends.py
+++ b/wagtail/wagtailsearch/tests/test_backends.py
@@ -151,27 +151,6 @@ class BackendTests(object):
         self.assertEqual(len(results), 3)
 
 
-class TestDBBackend(BackendTests, TestCase):
-    backend_path = 'wagtail.wagtailsearch.backends.db.DBSearch'
-
-    @unittest.expectedFailure
-    def test_callable_indexed_field(self):
-        super(TestDBBackend, self).test_callable_indexed_field()
-
-
-class TestElasticSearchBackend(BackendTests, TestCase):
-    backend_path = 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch'
-
-    def test_search_with_spaces_only(self):
-        # Search for some space characters and hope it doesn't crash
-        results = self.backend.search("   ", models.SearchTest)
-
-        # Queries are lazily evaluated, force it to run
-        list(results)
-
-        # Didn't crash, yay!
-
-
 @override_settings(WAGTAILSEARCH_BACKENDS={
     'default': {'BACKEND': 'wagtail.wagtailsearch.backends.db.DBSearch'}
 })
diff --git a/wagtail/wagtailsearch/tests/test_db_backend.py b/wagtail/wagtailsearch/tests/test_db_backend.py
new file mode 100644
index 000000000..f471a34d1
--- /dev/null
+++ b/wagtail/wagtailsearch/tests/test_db_backend.py
@@ -0,0 +1,13 @@
+from wagtail.tests.utils import unittest
+
+from django.test import TestCase
+
+from .test_backends import BackendTests
+
+
+class TestDBBackend(BackendTests, TestCase):
+    backend_path = 'wagtail.wagtailsearch.backends.db.DBSearch'
+
+    @unittest.expectedFailure
+    def test_callable_indexed_field(self):
+        super(TestDBBackend, self).test_callable_indexed_field()
diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
new file mode 100644
index 000000000..c2623fd54
--- /dev/null
+++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
@@ -0,0 +1,18 @@
+from wagtail.tests.utils import unittest
+
+from django.test import TestCase
+
+from .test_backends import BackendTests
+
+
+class TestElasticSearchBackend(BackendTests, TestCase):
+    backend_path = 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch'
+
+    def test_search_with_spaces_only(self):
+        # Search for some space characters and hope it doesn't crash
+        results = self.backend.search("   ", models.SearchTest)
+
+        # Queries are lazily evaluated, force it to run
+        list(results)
+
+        # Didn't crash, yay!

From f02a6937d262dcfa68ceb8e0551663799c7f9b17 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 17:31:52 +0100
Subject: [PATCH 034/154] Added more tests for ElasticSearch backend

---
 wagtail/tests/models.py                       |  15 +-
 .../tests/test_elasticsearch_backend.py       | 347 ++++++++++++++++++
 2 files changed, 357 insertions(+), 5 deletions(-)

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index 5787c19ff..86c85e7f9 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -323,21 +323,26 @@ class SearchTest(models.Model, indexed.Indexed):
     title = models.CharField(max_length=255)
     content = models.TextField()
     live = models.BooleanField(default=False)
+    published_date = models.DateField(null=True)
 
-    search_fields = (
-        indexed.SearchField('title'),
+    search_fields = [
+        indexed.SearchField('title', partial_match=True),
         indexed.SearchField('content'),
         indexed.SearchField('callable_indexed_field'),
+        indexed.FilterField('title'),
         indexed.FilterField('live'),
-    )
+        indexed.FilterField('published_date'),
+    ]
 
     def callable_indexed_field(self):
         return "Callable"
 
 
 class SearchTestChild(SearchTest):
+    subtitle = models.CharField(max_length=255, null=True, blank=True)
     extra_content = models.TextField()
 
-    search_fields = SearchTest.search_fields + (
+    search_fields = SearchTest.search_fields + [
+        indexed.SearchField('subtitle', partial_match=True),
         indexed.SearchField('extra_content'),
-    )
+    ]
diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
index c2623fd54..88aa87f8b 100644
--- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
+++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
@@ -1,7 +1,11 @@
 from wagtail.tests.utils import unittest
+import datetime
+import json
 
 from django.test import TestCase
+from django.db.models import Q
 
+from wagtail.tests import models
 from .test_backends import BackendTests
 
 
@@ -16,3 +20,346 @@ class TestElasticSearchBackend(BackendTests, TestCase):
         list(results)
 
         # Didn't crash, yay!
+
+    def test_partial_search(self):
+        # Reset the index
+        self.backend.reset_index()
+        self.backend.add_type(models.SearchTest)
+        self.backend.add_type(models.SearchTestChild)
+
+        # Add some test data
+        obj = models.SearchTest()
+        obj.title = "HelloWorld"
+        obj.live = True
+        obj.save()
+        self.backend.add(obj)
+
+        # Refresh the index
+        self.backend.refresh_index()
+
+        # Search and check
+        results = self.backend.search("HelloW", models.SearchTest.objects.all())
+
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0].id, obj.id)
+
+    def test_child_partial_search(self):
+        # Reset the index
+        self.backend.reset_index()
+        self.backend.add_type(models.SearchTest)
+        self.backend.add_type(models.SearchTestChild)
+
+        obj = models.SearchTestChild()
+        obj.title = "WorldHello"
+        obj.subtitle = "HelloWorld"
+        obj.live = True
+        obj.save()
+        self.backend.add(obj)
+
+        # Refresh the index
+        self.backend.refresh_index()
+
+        # Search and check
+        results = self.backend.search("HelloW", models.SearchTest.objects.all())
+
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0].id, obj.id)
+
+
+class TestElasticSearchQuery(TestCase):
+    def assertDictEqual(self, a, b):
+        default = self.JSONSerializer().default
+        self.assertEqual(json.dumps(a, sort_keys=True, default=default), json.dumps(b, sort_keys=True, default=default))
+
+    def setUp(self):
+        # Import using a try-catch block to prevent crashes if the elasticsearch-py
+        # module is not installed
+        try:
+            from wagtail.wagtailsearch.backends.elasticsearch import ElasticSearchQuery
+            from elasticsearch.serializer import JSONSerializer
+        except ImportError:
+            raise unittest.SkipTest("elasticsearch-py not installed")
+
+        self.ElasticSearchQuery = ElasticSearchQuery
+        self.JSONSerializer = JSONSerializer
+
+    def test_simple(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.all(), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_none_query_string(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.all(), None)
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'match_all': {}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_filter(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title="Test"), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_and_filter(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title="Test", live=True), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'and': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_or_filter(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(Q(title="Test") | Q(live=True)), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'or': [{'term': {'title_filter': 'Test'}}, {'term': {'live_filter': True}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_negated_filter(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.exclude(live=True), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'term': {'live_filter': True}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_fields(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.all(), "Hello", fields=['title'])
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'query_string': {'query': 'Hello', 'fields': ['title']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_exact_lookup(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__exact="Test"), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_none_lookup(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title=None), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_isnull_true_lookup(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__isnull=True), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_isnull_false_lookup(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__isnull=False), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'missing': {'field': 'title_filter'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_startswith_lookup(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__startswith="Test"), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'prefix': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_gt_lookup(self):
+        # This shares the same code path as gte, lt and lte so theres no need to test those
+        # This also tests conversion of python dates to strings
+
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__gt=datetime.datetime(2014, 4, 29)), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gt': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_range_lookup(self):
+        start_date = datetime.datetime(2014, 4, 29)
+        end_date = datetime.datetime(2014, 8, 19)
+
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__range=(start_date, end_date)), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gte': '2014-04-29', 'lte': '2014-08-19'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+
+class TestElasticSearchMapping(TestCase):
+    def assertDictEqual(self, a, b):
+        default = self.JSONSerializer().default
+        self.assertEqual(json.dumps(a, sort_keys=True, default=default), json.dumps(b, sort_keys=True, default=default))
+
+    def setUp(self):
+        # Import using a try-catch block to prevent crashes if the elasticsearch-py
+        # module is not installed
+        try:
+            from wagtail.wagtailsearch.backends.elasticsearch import ElasticSearchMapping
+            from elasticsearch.serializer import JSONSerializer
+        except ImportError:
+            raise unittest.SkipTest("elasticsearch-py not installed")
+
+        self.JSONSerializer = JSONSerializer
+
+        # Create ES mapping
+        self.es_mapping = ElasticSearchMapping(models.SearchTest)
+
+        # Create ES document
+        self.obj = models.SearchTest(title="Hello")
+        self.obj.save()
+
+    def test_get_document_type(self):
+        self.assertEqual(self.es_mapping.get_document_type(), 'tests_searchtest')
+
+    def test_get_mapping(self):
+        # Build mapping
+        mapping = self.es_mapping.get_mapping()
+
+        # Check
+        expected_result = {
+            'tests_searchtest': {
+                'properties': {
+                    'pk': {'index': 'not_analyzed', 'type': 'string', 'store': 'yes', 'include_in_all': False},
+                    'content_type': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
+                    '_partials': {'analyzer': 'edgengram_analyzer', 'include_in_all': False, 'type': 'string'},
+                    'live_filter': {'index': 'not_analyzed', 'type': 'boolean', 'include_in_all': False},
+                    'published_date_filter': {'index': 'not_analyzed', 'type': 'date', 'include_in_all': False},
+                    'title': {'type': 'string', 'include_in_all': True, 'analyzer': 'edgengram_analyzer'},
+                    'title_filter': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
+                    'content': {'type': 'string', 'include_in_all': True},
+                    'callable_indexed_field': {'type': 'string', 'include_in_all': True}
+                }
+            }
+        }
+
+        self.assertDictEqual(mapping, expected_result)
+
+    def test_get_document_id(self):
+        self.assertEqual(self.es_mapping.get_document_id(self.obj), 'tests_searchtest:' + str(self.obj.pk))
+
+    def test_get_document(self):
+        # Get document
+        document = self.es_mapping.get_document(self.obj)
+
+        # Check
+        expected_result = {
+            'pk': str(self.obj.pk),
+            'content_type': 'tests_searchtest',
+            '_partials': ['Hello'],
+            'live_filter': False,
+            'published_date_filter': None,
+            'title': 'Hello',
+            'title_filter': 'Hello',
+            'callable_indexed_field': 'Callable',
+            'content': '',
+        }
+
+        self.assertDictEqual(document, expected_result)
+
+
+class TestElasticSearchMappingInheritance(TestCase):
+    def assertDictEqual(self, a, b):
+        default = self.JSONSerializer().default
+        self.assertEqual(json.dumps(a, sort_keys=True, default=default), json.dumps(b, sort_keys=True, default=default))
+
+    def setUp(self):
+        # Import using a try-catch block to prevent crashes if the elasticsearch-py
+        # module is not installed
+        try:
+            from wagtail.wagtailsearch.backends.elasticsearch import ElasticSearchMapping
+            from elasticsearch.serializer import JSONSerializer
+        except ImportError:
+            raise unittest.SkipTest("elasticsearch-py not installed")
+
+        self.JSONSerializer = JSONSerializer
+
+        # Create ES mapping
+        self.es_mapping = ElasticSearchMapping(models.SearchTestChild)
+
+        # Create ES document
+        self.obj = models.SearchTestChild(title="Hello", subtitle="World")
+        self.obj.save()
+
+    def test_get_document_type(self):
+        self.assertEqual(self.es_mapping.get_document_type(), 'tests_searchtest_tests_searchtestchild')
+
+    def test_get_mapping(self):
+        # Build mapping
+        mapping = self.es_mapping.get_mapping()
+
+        # Check
+        expected_result = {
+            'tests_searchtest_tests_searchtestchild': {
+                'properties': {
+                    # New
+                    'extra_content': {'type': 'string', 'include_in_all': True},
+                    'subtitle': {'type': 'string', 'include_in_all': True, 'analyzer': 'edgengram_analyzer'},
+
+                    # Inherited
+                    'pk': {'index': 'not_analyzed', 'type': 'string', 'store': 'yes', 'include_in_all': False},
+                    'content_type': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
+                    '_partials': {'analyzer': 'edgengram_analyzer', 'include_in_all': False, 'type': 'string'},
+                    'live_filter': {'index': 'not_analyzed', 'type': 'boolean', 'include_in_all': False},
+                    'published_date_filter': {'index': 'not_analyzed', 'type': 'date', 'include_in_all': False},
+                    'title': {'type': 'string', 'include_in_all': True, 'analyzer': 'edgengram_analyzer'},
+                    'title_filter': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
+                    'content': {'type': 'string', 'include_in_all': True},
+                    'callable_indexed_field': {'type': 'string', 'include_in_all': True}
+                }
+            }
+        }
+
+        self.assertDictEqual(mapping, expected_result)
+
+    def test_get_document_id(self):
+        # This must be tests_searchtest instead of 'tests_searchtest_tests_searchtestchild'
+        # as it uses the contents base content type name.
+        # This prevents the same object being accidentally indexed twice.
+        self.assertEqual(self.es_mapping.get_document_id(self.obj), 'tests_searchtest:' + str(self.obj.pk))
+
+    def test_get_document(self):
+        # Build document
+        document = self.es_mapping.get_document(self.obj)
+
+        # Sort partials
+        if '_partials' in document:
+            document['_partials'].sort()
+
+        # Check
+        expected_result = {
+            # New
+            'extra_content': '',
+            'subtitle': 'World',
+
+            # Changed
+            'content_type': 'tests_searchtest_tests_searchtestchild',
+
+            # Inherited
+            'pk': str(self.obj.pk),
+            '_partials': ['Hello', 'World'],
+            'live_filter': False,
+            'published_date_filter': None,
+            'title': 'Hello',
+            'title_filter': 'Hello',
+            'callable_indexed_field': 'Callable',
+            'content': '',
+        }
+
+        self.assertDictEqual(document, expected_result)

From 04c507e37be80b9ba5b88fdc6140acdad43f3ed3 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 18:25:42 +0100
Subject: [PATCH 035/154] Added tests for indexed class

---
 wagtail/tests/models.py                       | 28 +++++++++++
 .../wagtailsearch/tests/test_indexed_class.py | 49 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 wagtail/wagtailsearch/tests/test_indexed_class.py

diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index 86c85e7f9..504648933 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -346,3 +346,31 @@ class SearchTestChild(SearchTest):
         indexed.SearchField('subtitle', partial_match=True),
         indexed.SearchField('extra_content'),
     ]
+
+
+class SearchTestOldConfig(models.Model, indexed.Indexed):
+    """
+    This tests that the Indexed class can correctly handle models that
+    use the old "indexed_fields" configuration format.
+    """
+    indexed_fields = {
+        # A search field with predictive search and boosting
+        'title': {
+            'type': 'string',
+            'analyzer': 'edgengram_analyzer',
+            'boost': 100,
+        },
+
+        # A filter field
+        'live': {
+            'type': 'boolean',
+            'index': 'not_analyzed',
+        },
+    }
+
+class SearchTestOldConfigList(models.Model, indexed.Indexed):
+    """
+    This tests that the Indexed class can correctly handle models that
+    use the old "indexed_fields" configuration format using a list.
+    """
+    indexed_fields = ['title', 'content']
diff --git a/wagtail/wagtailsearch/tests/test_indexed_class.py b/wagtail/wagtailsearch/tests/test_indexed_class.py
new file mode 100644
index 000000000..a54f135c3
--- /dev/null
+++ b/wagtail/wagtailsearch/tests/test_indexed_class.py
@@ -0,0 +1,49 @@
+from django.test import TestCase
+from wagtail.tests import models
+import json
+
+from wagtail.wagtailsearch import indexed
+
+
+class TestContentTypeNames(TestCase):
+    def test_base_content_type_name(self):
+        name = models.SearchTestChild.indexed_get_toplevel_content_type()
+        self.assertEqual(name, 'tests_searchtest')
+
+    def test_qualified_content_type_name(self):
+        name = models.SearchTestChild.indexed_get_content_type()
+        self.assertEqual(name, 'tests_searchtest_tests_searchtestchild')
+
+
+class TestIndexedFieldsBackwardsCompatibility(TestCase):
+    def test_indexed_fields_backwards_compatibility(self):
+        # Get search fields
+        search_fields = models.SearchTestOldConfig.get_search_fields()
+
+        search_fields_dict = dict(
+            ((field.field_name, type(field)), field)
+            for field in search_fields
+        )
+
+        # Check that the fields were found
+        self.assertEqual(len(search_fields_dict), 2)
+        self.assertIn(('title', indexed.SearchField), search_fields_dict.keys())
+        self.assertIn(('live', indexed.FilterField), search_fields_dict.keys())
+
+        # Check that the title field has the correct settings
+        self.assertTrue(search_fields_dict[('title', indexed.SearchField)].partial_match)
+        self.assertEqual(search_fields_dict[('title', indexed.SearchField)].boost, 100)
+
+    def test_indexed_fields_backwards_compatibility_list(self):
+        # Get search fields
+        search_fields = models.SearchTestOldConfigList.get_search_fields()
+
+        search_fields_dict = dict(
+            ((field.field_name, type(field)), field)
+            for field in search_fields
+        )
+
+        # Check that the fields were found
+        self.assertEqual(len(search_fields_dict), 2)
+        self.assertIn(('title', indexed.SearchField), search_fields_dict.keys())
+        self.assertIn(('content', indexed.SearchField), search_fields_dict.keys())

From cd14be23c3361d334f7a9367b1cad3ab45880054 Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Thu, 3 Jul 2014 12:22:44 +0100
Subject: [PATCH 036/154] Tweak FieldPanel tests

---
 wagtail/wagtailadmin/tests/test_edit_handlers.py | 6 +++---
 wagtail/wagtailsnippets/tests.py                 | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
index fa9f3f650..d5af430eb 100644
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -186,15 +186,15 @@ class TestFieldPanel(TestCase):
         self.assertEqual(self.field_panel.field_type(), 'fake_class')
 
     def test_widget_overrides(self):
-        result = self.field_panel.widget_overrides()
+        result = FieldPanel.widget_overrides()
         self.assertEqual(result, {})
 
     def test_required_formsets(self):
-        result = self.field_panel.required_formsets()
+        result = FieldPanel.required_formsets()
         self.assertEqual(result, [])
 
     def test_get_form_class(self):
-        result = self.field_panel.get_form_class(Page)
+        result = FieldPanel.get_form_class(Page)
         self.assertTrue(issubclass(result, WagtailAdminModelForm))
 
     def test_render_js(self):
diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py
index 29a0ae284..61bf9baaf 100644
--- a/wagtail/wagtailsnippets/tests.py
+++ b/wagtail/wagtailsnippets/tests.py
@@ -5,9 +5,12 @@ from wagtail.tests.utils import WagtailTestUtils
 from wagtail.tests.models import Advert, AlphaSnippet, ZuluSnippet
 from wagtail.wagtailsnippets.models import register_snippet, SNIPPET_MODELS
 
-from wagtail.wagtailsnippets.views.snippets import get_content_type_from_url_params, get_snippet_edit_handler
+from wagtail.wagtailsnippets.views.snippets import (
+    get_snippet_edit_handler
+)
 from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel
 
+
 class TestSnippetIndexView(TestCase, WagtailTestUtils):
     def setUp(self):
         self.login()

From 63e5ca34ce9ad6b9bd1229a207767a51a76328e9 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 3 Jul 2014 12:31:18 +0100
Subject: [PATCH 037/154] Make sure field filters are sorted before checking
 them

---
 .../tests/test_elasticsearch_backend.py         | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
index 88aa87f8b..0c7906b39 100644
--- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
+++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
@@ -113,15 +113,26 @@ class TestElasticSearchQuery(TestCase):
 
         # Check it
         expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'and': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
-        self.assertDictEqual(query.to_es(), expected_result)
+
+        # Make sure field filters are sorted (as they can be in any order which may cause false positives)
+        query = query.to_es()
+        field_filters = query['filtered']['filter']['and'][1]['and']
+        field_filters[:] = sorted(field_filters, key=lambda f: list(f['term'].keys())[0])
+
+        self.assertDictEqual(query, expected_result)
 
     def test_or_filter(self):
         # Create a query
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(Q(title="Test") | Q(live=True)), "Hello")
 
+        # Make sure field filters are sorted (as they can be in any order which may cause false positives)
+        query = query.to_es()
+        field_filters = query['filtered']['filter']['and'][1]['or']
+        field_filters[:] = sorted(field_filters, key=lambda f: list(f['term'].keys())[0])
+
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'or': [{'term': {'title_filter': 'Test'}}, {'term': {'live_filter': True}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
-        self.assertDictEqual(query.to_es(), expected_result)
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'or': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query, expected_result)
 
     def test_negated_filter(self):
         # Create a query

From 001fcabb46e986f5be8bbe0c4b2e61cd14507d10 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 3 Jul 2014 12:44:53 +0100
Subject: [PATCH 038/154] Fixed python 3.2 incompatible migration

---
 ...to__del_searchtestchild__del_searchtest.py | 70 ++++++++++---------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py b/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py
index 560dbaae9..6826ddaa1 100644
--- a/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py
+++ b/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
 from south.utils import datetime_utils as datetime
 from south.db import db
 from south.v2 import SchemaMigration
@@ -9,76 +11,76 @@ class Migration(SchemaMigration):
 
     def forwards(self, orm):
         # Deleting model 'SearchTestChild'
-        db.delete_table(u'wagtailsearch_searchtestchild')
+        db.delete_table('wagtailsearch_searchtestchild')
 
         # Deleting model 'SearchTest'
-        db.delete_table(u'wagtailsearch_searchtest')
+        db.delete_table('wagtailsearch_searchtest')
 
 
     def backwards(self, orm):
         # Adding model 'SearchTestChild'
-        db.create_table(u'wagtailsearch_searchtestchild', (
+        db.create_table('wagtailsearch_searchtestchild', (
             ('extra_content', self.gf('django.db.models.fields.TextField')()),
-            (u'searchtest_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['wagtailsearch.SearchTest'], unique=True, primary_key=True)),
+            ('searchtest_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['wagtailsearch.SearchTest'], unique=True, primary_key=True)),
         ))
-        db.send_create_signal(u'wagtailsearch', ['SearchTestChild'])
+        db.send_create_signal('wagtailsearch', ['SearchTestChild'])
 
         # Adding model 'SearchTest'
-        db.create_table(u'wagtailsearch_searchtest', (
+        db.create_table('wagtailsearch_searchtest', (
             ('content', self.gf('django.db.models.fields.TextField')()),
             ('live', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
         ))
-        db.send_create_signal(u'wagtailsearch', ['SearchTest'])
+        db.send_create_signal('wagtailsearch', ['SearchTest'])
 
 
     models = {
-        u'auth.group': {
+        'auth.group': {
             'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
         },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
             'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        u'auth.user': {
+        'auth.user': {
             'Meta': {'object_name': 'User'},
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
             'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}),
             'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
         },
-        u'contenttypes.contenttype': {
+        'contenttypes.contenttype': {
             'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
             'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
         },
-        u'wagtailcore.page': {
+        'wagtailcore.page': {
             'Meta': {'object_name': 'Page'},
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}),
             'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
             'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['auth.User']"}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['auth.User']"}),
             'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
             'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
             'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
@@ -87,25 +89,25 @@ class Migration(SchemaMigration):
             'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
         },
-        u'wagtailsearch.editorspick': {
+        'wagtailsearch.editorspick': {
             'Meta': {'ordering': "('sort_order',)", 'object_name': 'EditorsPick'},
             'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'page': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['wagtailcore.Page']"}),
-            'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editors_picks'", 'to': u"orm['wagtailsearch.Query']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['wagtailcore.Page']"}),
+            'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editors_picks'", 'to': "orm['wagtailsearch.Query']"}),
             'sort_order': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
         },
-        u'wagtailsearch.query': {
+        'wagtailsearch.query': {
             'Meta': {'object_name': 'Query'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'query_string': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
         },
-        u'wagtailsearch.querydailyhits': {
+        'wagtailsearch.querydailyhits': {
             'Meta': {'unique_together': "(('query', 'date'),)", 'object_name': 'QueryDailyHits'},
             'date': ('django.db.models.fields.DateField', [], {}),
             'hits': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'daily_hits'", 'to': u"orm['wagtailsearch.Query']"})
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'daily_hits'", 'to': "orm['wagtailsearch.Query']"})
         }
     }
 

From 08ced063ff09d102922deaf279275e4c0fb5ff4d Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 18:56:08 +0100
Subject: [PATCH 039/154] Moved search method into base search backend

---
 wagtail/wagtailcore/models.py                 |  2 +-
 wagtail/wagtailsearch/backends/base.py        | 38 ++++++++++++++++++-
 wagtail/wagtailsearch/backends/db.py          | 34 +++++------------
 .../wagtailsearch/backends/elasticsearch.py   | 34 +----------------
 4 files changed, 48 insertions(+), 60 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 4964966a3..b6a664548 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -514,7 +514,7 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, indexed.Index
 
         # Search
         s = get_search_backend()
-        return s.search(query_string, model=cls, fields=fields, filters=filters, prefetch_related=prefetch_related)
+        return s.search(query_string, cls, fields=fields, filters=filters, prefetch_related=prefetch_related)
 
     @classmethod
     def clean_subpage_types(cls):
diff --git a/wagtail/wagtailsearch/backends/base.py b/wagtail/wagtailsearch/backends/base.py
index 393ecae1b..82e2e8d56 100644
--- a/wagtail/wagtailsearch/backends/base.py
+++ b/wagtail/wagtailsearch/backends/base.py
@@ -1,6 +1,9 @@
 from django.db import models
+from django.db.models.query import QuerySet
+from django.core.exceptions import ImproperlyConfigured
 
 from wagtail.wagtailsearch.indexed import Indexed
+from wagtail.wagtailsearch.utils import normalise_query_string
 
 
 class BaseSearch(object):
@@ -32,5 +35,38 @@ class BaseSearch(object):
     def delete(self, obj):
         return NotImplemented
 
-    def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]):
+    def _search(self, queryset, query_string, fields=None):
         return NotImplemented
+
+    def search(self, query_string, model_or_queryset, fields=None, filters=None, prefetch_related=None):
+        # Find model/queryset
+        if isinstance(model_or_queryset, QuerySet):
+            model = model_or_queryset.model
+            queryset = model_or_queryset
+        else:
+            model = model_or_queryset
+            queryset = model_or_queryset.objects.all()
+
+        # Model must be a descendant of Indexed and be a django model
+        if not issubclass(model, Indexed) or not issubclass(model, models.Model):
+            return []
+
+        # Normalise query string
+        if query_string is not None:
+            query_string = normalise_query_string(query_string)
+
+        # Check that theres still a query string after the clean up
+        if query_string == "":
+            return []
+
+        # Apply filters to queryset
+        if filters:
+            queryset = queryset.filter(**filters)
+
+        # Prefetch related
+        if prefetch_related:
+            for prefetch in prefetch_related:
+                queryset = queryset.prefetch_related(prefetch)
+
+        # Search
+        return self._search(queryset, query_string, fields=fields)
diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py
index 56536e343..a94fe3c58 100644
--- a/wagtail/wagtailsearch/backends/db.py
+++ b/wagtail/wagtailsearch/backends/db.py
@@ -2,7 +2,6 @@ from django.db import models
 
 from wagtail.wagtailsearch.backends.base import BaseSearch
 from wagtail.wagtailsearch.indexed import Indexed
-from wagtail.wagtailsearch.utils import normalise_query_string
 
 
 class DBSearch(BaseSearch):
@@ -27,26 +26,16 @@ class DBSearch(BaseSearch):
     def delete(self, obj):
         pass # Not needed
 
-    def search(self, query_string, model, fields=None, filters=None, prefetch_related=None):
-        # Get fields
-        if fields is None:
-            fields = [field.field_name for field in model.get_searchable_search_fields()]
-
-        # Start with all objects
-        query = model.objects.all()
-
-        # Apply filters
-        if filters:
-            query = query.filter(**filters)
-
+    def _search(self, queryset, query_string, fields=None):
         if query_string is not None:
-            # Normalise query string
-            query_string = normalise_query_string(query_string)
+            # Get fields
+            if fields is None:
+                fields = [field.field_name for field in queryset.model.get_searchable_search_fields()]
 
             # Get terms
             terms = query_string.split()
             if not terms:
-                return model.objects.none()
+                return queryset.model.objects.none()
 
             # Filter by terms
             for term in terms:
@@ -54,21 +43,16 @@ class DBSearch(BaseSearch):
                 for field_name in fields:
                     # Check if the field exists (this will filter out indexed callables)
                     try:
-                        model._meta.get_field_by_name(field_name)
+                        queryset.model._meta.get_field_by_name(field_name)
                     except:
                         continue
 
                     # Filter on this field
                     term_query |= models.Q(**{'%s__icontains' % field_name: term})
 
-                query = query.filter(term_query)
+                queryset = queryset.filter(term_query)
 
             # Distinct
-            query = query.distinct()
+            queryset = queryset.distinct()
 
-        # Prefetch related
-        if prefetch_related:
-            for prefetch in prefetch_related:
-                query = query.prefetch_related(prefetch)
-
-        return query
+        return queryset
diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index ea0413eed..8f17ba6ce 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -3,14 +3,12 @@ from __future__ import absolute_import
 import json
 
 from django.db import models
-from django.db.models.query import QuerySet
 
 from elasticsearch import Elasticsearch, NotFoundError, RequestError
 from elasticsearch.helpers import bulk
 
 from wagtail.wagtailsearch.backends.base import BaseSearch
 from wagtail.wagtailsearch.indexed import Indexed, SearchField, FilterField
-from wagtail.wagtailsearch.utils import normalise_query_string
 
 
 class ElasticSearchMapping(object):
@@ -576,35 +574,5 @@ class ElasticSearch(BaseSearch):
         except NotFoundError:
             pass  # Document doesn't exist, ignore this exception
 
-    def search(self, query_string, model_or_queryset, fields=None, filters=None, prefetch_related=None):
-        # Find model/queryset
-        if isinstance(model_or_queryset, QuerySet):
-            model = model_or_queryset.model
-            queryset = model_or_queryset
-        else:
-            model = model_or_queryset
-            queryset = model_or_queryset.objects.all()
-
-        # Model must be a descendant of Indexed and be a django model
-        if not issubclass(model, Indexed) or not issubclass(model, models.Model):
-            return []
-
-        # Normalise query string
-        if query_string is not None:
-            query_string = normalise_query_string(query_string)
-
-        # Check that theres still a query string after the clean up
-        if query_string == "":
-            return []
-
-        # Apply filters to queryset
-        if filters:
-            queryset = queryset.filter(**filters)
-
-        # Prefetch related
-        if prefetch_related:
-            for prefetch in prefetch_related:
-                queryset = queryset.prefetch_related(prefetch)
-
-        # Return search results
+    def _search(self, queryset, query_string, fields=None):
         return ElasticSearchResults(self, ElasticSearchQuery(queryset, query_string, fields=fields))

From e35e20dd10e2be669addbde992b24b41d78d9f5a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 19:14:46 +0100
Subject: [PATCH 040/154] Added search method to PageQuerySet

---
 wagtail/wagtailcore/models.py | 3 +++
 wagtail/wagtailcore/query.py  | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index b6a664548..daee31fb3 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -228,6 +228,9 @@ class PageManager(models.Manager):
     def not_type(self, model):
         return self.get_queryset().not_type(model)
 
+    def search(self, query_string, fields=None, backend='default'):
+        return self.get_queryset().search(query_string, fields=fields, backend=backend)
+
 
 class PageBase(models.base.ModelBase):
     """Metaclass for Page"""
diff --git a/wagtail/wagtailcore/query.py b/wagtail/wagtailcore/query.py
index 57e8ffff3..422e46f47 100644
--- a/wagtail/wagtailcore/query.py
+++ b/wagtail/wagtailcore/query.py
@@ -2,6 +2,8 @@ from django.db.models import Q
 from django.contrib.contenttypes.models import ContentType
 from treebeard.mp_tree import MP_NodeQuerySet
 
+from wagtail.wagtailsearch.backends import get_search_backend
+
 
 class PageQuerySet(MP_NodeQuerySet):
     """
@@ -107,3 +109,7 @@ class PageQuerySet(MP_NodeQuerySet):
 
     def not_type(self, model):
         return self.exclude(self.type_q(model))
+
+    def search(self, query_string, fields=None, backend='default'):
+        search_backend = get_search_backend(backend)
+        return search_backend.search(query_string, self, fields=None)

From b78b6486829f748daf42d6240426abb44d8329a5 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 22 Jun 2014 21:07:09 +0100
Subject: [PATCH 041/154] Implemented __in lookup in ElasticSearch backend

Also added an error message if a user attempts to use a subquery with the __in lookup.
---
 wagtail/wagtailsearch/backends/elasticsearch.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 8f17ba6ce..289b0f4b2 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -3,6 +3,7 @@ from __future__ import absolute_import
 import json
 
 from django.db import models
+from django.db.models.sql.where import SubqueryConstraint
 
 from elasticsearch import Elasticsearch, NotFoundError, RequestError
 from elasticsearch.helpers import bulk
@@ -201,7 +202,16 @@ class ElasticSearchQuery(object):
                     }
                 }
 
-            raise FilterError('Could not apply filter on ElasticSearch results "' + field_name + '__' + lookup + ' = ' + unicode(value) + '". Lookup "' + lookup + '"" not recognosed.')
+            if lookup == 'in':
+                return {
+                    'terms': {
+                        field_index_name: value,
+                    }
+                }
+
+            raise FilterError('Could not apply filter on ElasticSearch results: "' + field_name + '__' + lookup + ' = ' + unicode(value) + '". Lookup "' + lookup + '"" not recognosed.')
+        elif isinstance(where_node, SubqueryConstraint):
+            raise FilterError('Could not apply filter on ElasticSearch results: Subqueries are not allowed.')
 
         # Get child filters
         connector = where_node.connector

From 9e1bd2d601ab540eb0d2d383ddeec369ef7c94c1 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 24 Jun 2014 14:27:40 +0100
Subject: [PATCH 042/154] Added get_indexed_objects method to Indexed class
 This gives developers control over the QuerySet used when the model is added
 to the indexed

---
 wagtail/wagtailsearch/indexed.py                          | 4 ++++
 wagtail/wagtailsearch/management/commands/update_index.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py
index a2cb54d14..2e506d690 100644
--- a/wagtail/wagtailsearch/indexed.py
+++ b/wagtail/wagtailsearch/indexed.py
@@ -118,6 +118,10 @@ class Indexed(object):
     def get_filterable_search_fields(cls):
         return filter(lambda field: isinstance(field, FilterField), cls.get_search_fields())
 
+    @classmethod
+    def get_indexed_objects(cls):
+        return cls.objects.all()
+
     indexed_fields = ()
 
 
diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py
index 2c1593635..c52b75639 100644
--- a/wagtail/wagtailsearch/management/commands/update_index.py
+++ b/wagtail/wagtailsearch/management/commands/update_index.py
@@ -24,7 +24,7 @@ class Command(BaseCommand):
             toplevel_content_type = model.indexed_get_toplevel_content_type()
 
             # Loop through objects
-            for obj in model.objects.all():
+            for obj in model.get_indexed_objects():
                 # Get key for this object
                 key = toplevel_content_type + ':' + str(obj.pk)
 

From b9d3e44ebf1b146987338c137c9bb867a81f52fd Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 24 Jun 2014 14:28:40 +0100
Subject: [PATCH 043/154] Use get_indexed_objects to speed up indexing of
 Images/Documents Previously, this created a query for every single image and
 document to get the tags. This was very slow on RCA which has over 15000
 images. This commit fixes this by adding a prefetch_related to the QuerySet
 used for indexing.

---
 wagtail/wagtailadmin/taggable.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/taggable.py b/wagtail/wagtailadmin/taggable.py
index 91c36ca7f..3b7de479c 100644
--- a/wagtail/wagtailadmin/taggable.py
+++ b/wagtail/wagtailadmin/taggable.py
@@ -21,7 +21,11 @@ class TagSearchable(indexed.Indexed):
 
     @property
     def get_tags(self):
-        return ' '.join([tag.name for tag in self.tags.all()])
+        return ' '.join([tag.name for tag in self.prefetched_tags()])
+
+    @classmethod
+    def get_indexed_objects(cls):
+        return super(TagSearchable, cls).get_indexed_objects().prefetch_related('tagged_items__tag')
 
     @classmethod
     def search(cls, q, results_per_page=None, page=1, prefetch_tags=False, filters={}):

From c9385ca1ce241ff15f88faa262800ae561098d58 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 3 Jul 2014 13:10:03 +0100
Subject: [PATCH 044/154] frontend cache purge docs change

---
 docs/frontend_cache_purging.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/frontend_cache_purging.rst b/docs/frontend_cache_purging.rst
index e8564f6c1..34a6fda50 100644
--- a/docs/frontend_cache_purging.rst
+++ b/docs/frontend_cache_purging.rst
@@ -107,9 +107,11 @@ Purging individual URLs
 
 ``wagtail.contrib.wagtailfrontendcache.utils`` provides another utils function called ``purge_url_from_cache``. As the name suggests, this purges an individual URL from the cache.
 
+For example, this could be useful for purging a single page of blogs:
+
 .. code-block:: python
 
     from wagtail.contrib.wagtailfrontendcache.utils import purge_url_from_cache
 
-    # Purge the homepage
-    purge_url_from_cache(homepage.full_url)
+    # Purge the first page of the blog index
+    purge_url_from_cache(blog_index.url + '?page=1')

From 69077927f9a7132a5e7f1a8e19b7423648abb21b Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Thu, 3 Jul 2014 13:56:43 +0100
Subject: [PATCH 045/154] Fix FieldPanel test failures

---
 wagtail/wagtailadmin/tests/test_edit_handlers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
index d5af430eb..30fda39a5 100644
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -186,15 +186,15 @@ class TestFieldPanel(TestCase):
         self.assertEqual(self.field_panel.field_type(), 'fake_class')
 
     def test_widget_overrides(self):
-        result = FieldPanel.widget_overrides()
+        result = FieldPanel('barbecue', 'snowman').widget_overrides()
         self.assertEqual(result, {})
 
     def test_required_formsets(self):
-        result = FieldPanel.required_formsets()
+        result = FieldPanel('barbecue', 'snowman').required_formsets()
         self.assertEqual(result, [])
 
     def test_get_form_class(self):
-        result = FieldPanel.get_form_class(Page)
+        result = FieldPanel('barbecue', 'snowman').get_form_class(Page)
         self.assertTrue(issubclass(result, WagtailAdminModelForm))
 
     def test_render_js(self):

From c0cb1b62806f3b81d2410d1d8382b32922c2619f Mon Sep 17 00:00:00 2001
From: Tom Talbot <tom.talbot@torchbox.com>
Date: Thu, 3 Jul 2014 14:11:29 +0100
Subject: [PATCH 046/154] Remove mock expected calls from edit handler tests

'Expected calls' works differently in Python 2 and 3
---
 wagtail/wagtailadmin/tests/test_edit_handlers.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
index 30fda39a5..48e24aff2 100644
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -357,8 +357,6 @@ class TestInlinePanel(TestCase):
             form=self.fake_field)
         result = inline_panel.get_panel_definitions()
         self.assertEqual(result[0].name, 'mock panel')
-        expected_calls = '[call(instance=fake instance, form=fake form),\n call(instance=fake instance, form=fake form)]'
-        self.assertEqual(str(self.mock_panel.mock_calls), expected_calls)
 
     def test_get_panel_definitions(self):
         """
@@ -374,8 +372,6 @@ class TestInlinePanel(TestCase):
             form=self.fake_field)
         result = inline_panel.get_panel_definitions()
         self.assertEqual(result[0].name, 'other mock panel')
-        expected_calls = '[call(instance=fake instance, form=fake form),\n call(instance=fake instance, form=fake form)]'
-        self.assertEqual(str(other_mock_panel.mock_calls), expected_calls)
 
     def test_required_formsets(self):
         inline_panel = InlinePanel(self.mock_model, 'formset')(

From 532bb6241e7cbced94fb044306e3eba7a447be82 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 3 Jul 2014 14:26:05 +0100
Subject: [PATCH 047/154] Added some more FilterFields to Page

---
 wagtail/wagtailcore/models.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index daee31fb3..75021d584 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -285,8 +285,12 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, indexed.Index
 
     search_fields = (
         indexed.SearchField('title', partial_match=True, boost=100),
+        indexed.FilterField('id'),
         indexed.FilterField('live'),
+        indexed.FilterField('owner'),
+        indexed.FilterField('content_type'),
         indexed.FilterField('path'),
+        indexed.FilterField('depth'),
     )
 
     def __init__(self, *args, **kwargs):

From dd52ccab2aa41f8410da18ee0b26d99e3adb87a3 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 12 Jun 2014 13:03:46 +0100
Subject: [PATCH 048/154] Remove X-Requested-With header hacks on the incoming
 requests to preview_on_edit and preview_on_create - no longer necessary,
 because we're not passing that request to the preview logic

Conflicts:
	wagtail/wagtailadmin/views/pages.py
---
 wagtail/wagtailadmin/views/pages.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index fd0c97b02..7a2ec4f06 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -409,13 +409,6 @@ def preview_on_edit(request, page_id):
     if form.is_valid():
         form.save(commit=False)
 
-        # This view will generally be invoked as an AJAX request; as such, in the case of
-        # an error Django will return a plaintext response. This isn't what we want, since
-        # we will be writing the response back to an HTML page regardless of success or
-        # failure - as such, we strip out the X-Requested-With header to get Django to return
-        # an HTML error response
-        request.META.pop('HTTP_X_REQUESTED_WITH', None)
-
         try:
             display_mode = request.GET['mode']
         except KeyError:
@@ -465,13 +458,6 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p
         page.depth = parent_page.depth + 1
         page.path = Page._get_children_path_interval(parent_page.path)[1]
 
-        # This view will generally be invoked as an AJAX request; as such, in the case of
-        # an error Django will return a plaintext response. This isn't what we want, since
-        # we will be writing the response back to an HTML page regardless of success or
-        # failure - as such, we strip out the X-Requested-With header to get Django to return
-        # an HTML error response
-        request.META.pop('HTTP_X_REQUESTED_WITH', None)
-
         try:
             display_mode = request.GET['mode']
         except KeyError:

From 78481dc84665a9b27645c1139cb90a02ff6128e1 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 12 Jun 2014 16:48:44 +0100
Subject: [PATCH 049/154] syntactic sugar for get_page_modes: change it to a
 property called preview_modes and add a default_preview_mode helper

Conflicts:
	wagtail/wagtailadmin/views/pages.py
---
 docs/building_your_site/djangodevelopers.rst |  2 +-
 docs/model_recipes.rst                       |  6 ++---
 wagtail/wagtailadmin/views/pages.py          | 23 +++++++-------------
 wagtail/wagtailcore/models.py                | 15 ++++++++++---
 wagtail/wagtailforms/models.py               |  9 ++++----
 5 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/docs/building_your_site/djangodevelopers.rst b/docs/building_your_site/djangodevelopers.rst
index aeabb264f..e72573089 100644
--- a/docs/building_your_site/djangodevelopers.rst
+++ b/docs/building_your_site/djangodevelopers.rst
@@ -201,6 +201,7 @@ Properties:
 * status_string
 * subpage_types
 * indexed_fields
+* preview_modes
 
 Methods:
 
@@ -213,7 +214,6 @@ Methods:
 * get_descendants
 * get_siblings
 * search
-* get_page_modes
 * show_as_mode
 
 
diff --git a/docs/model_recipes.rst b/docs/model_recipes.rst
index 6a4abed47..ae011126a 100644
--- a/docs/model_recipes.rst
+++ b/docs/model_recipes.rst
@@ -190,10 +190,10 @@ Load Alternate Templates by Overriding get_template()
 
 
 
-Page Modes
-----------
+Preview Modes
+-------------
 
-get_page_modes
+preview_modes
 show_as_mode
 
 
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 7a2ec4f06..e5a0c885c 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -230,7 +230,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
         'page_class': page_class,
         'parent_page': parent_page,
         'edit_handler': edit_handler,
-        'display_modes': page.get_page_modes(),
+        'display_modes': page.preview_modes,
         'form': form, # Used in unit tests
     })
 
@@ -361,7 +361,7 @@ def edit(request, page_id):
         'page': page,
         'edit_handler': edit_handler,
         'errors_debug': errors_debug,
-        'display_modes': page.get_page_modes(),
+        'display_modes': page.preview_modes,
         'form': form, # Used in unit tests
     })
 
@@ -409,12 +409,8 @@ def preview_on_edit(request, page_id):
     if form.is_valid():
         form.save(commit=False)
 
-        try:
-            display_mode = request.GET['mode']
-        except KeyError:
-            display_mode = page.get_page_modes()[0][0]
-
-        response = page.show_as_mode(display_mode)
+        preview_mode = request.GET.get('mode', page.default_preview_mode)
+        response = page.show_as_mode(preview_mode)
 
         response['X-Wagtail-Preview'] = 'ok'
         return response
@@ -425,7 +421,7 @@ def preview_on_edit(request, page_id):
         response = render(request, 'wagtailadmin/pages/edit.html', {
             'page': page,
             'edit_handler': edit_handler,
-            'display_modes': page.get_page_modes(),
+            'display_modes': page.preview_modes,
         })
         response['X-Wagtail-Preview'] = 'error'
         return response
@@ -458,11 +454,8 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p
         page.depth = parent_page.depth + 1
         page.path = Page._get_children_path_interval(parent_page.path)[1]
 
-        try:
-            display_mode = request.GET['mode']
-        except KeyError:
-            display_mode = page.get_page_modes()[0][0]
-        response = page.show_as_mode(display_mode)
+        preview_mode = request.GET.get('mode', page.default_preview_mode)
+        response = page.show_as_mode(preview_mode)
 
         response['X-Wagtail-Preview'] = 'ok'
         return response
@@ -476,7 +469,7 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p
             'page_class': page_class,
             'parent_page': parent_page,
             'edit_handler': edit_handler,
-            'display_modes': page.get_page_modes(),
+            'display_modes': page.preview_modes,
         })
         response['X-Wagtail-Preview'] = 'error'
         return response
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index b980d7f54..42e132daa 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -706,19 +706,28 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
                                 "request middleware returned a response")
         return request
 
-    def get_page_modes(self):
+    @property
+    def preview_modes(self):
         """
-        Return a list of (internal_name, display_name) tuples for the modes in which
+        A list of (internal_name, display_name) tuples for the modes in which
         this page can be displayed for preview/moderation purposes. Ordinarily a page
         will only have one display mode, but subclasses of Page can override this -
         for example, a page containing a form might have a default view of the form,
         and a post-submission 'thankyou' page
         """
+        return self.get_page_modes()
+
+    def get_page_modes(self):
+        # Deprecated accessor for the preview_modes property
         return [('', 'Default')]
 
+    @property
+    def default_preview_mode(self):
+        return self.preview_modes[0][0]
+
     def show_as_mode(self, mode_name):
         """
-        Given an internal name from the get_page_modes() list, return an HTTP response
+        Given an internal name from the preview_modes list, return an HTTP response
         indicative of the page being viewed in that mode. By default this passes a
         dummy request into the serve() mechanism, ensuring that it matches the behaviour
         on the front-end; subclasses that define additional page modes will need to
diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py
index 41414d391..6bde684ac 100644
--- a/wagtail/wagtailforms/models.py
+++ b/wagtail/wagtailforms/models.py
@@ -170,11 +170,10 @@ class AbstractForm(Page):
             'form': form,
         })
 
-    def get_page_modes(self):
-        return [
-            ('form', 'Form'),
-            ('landing', 'Landing page'),
-        ]
+    preview_modes = [
+        ('form', 'Form'),
+        ('landing', 'Landing page'),
+    ]
 
     def show_as_mode(self, mode):
         if mode == 'landing':

From 0a38e0b8d3122db090475ac887ff6d00f9d1b2ff Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 12 Jun 2014 16:57:09 +0100
Subject: [PATCH 050/154] rename display_modes to preview_modes for consistency

Conflicts:
	wagtail/wagtailadmin/views/pages.py
---
 .../wagtailadmin/templates/wagtailadmin/pages/create.html | 4 ++--
 .../wagtailadmin/templates/wagtailadmin/pages/edit.html   | 4 ++--
 wagtail/wagtailadmin/views/pages.py                       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
index b87af8fae..f21b93a27 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
@@ -39,12 +39,12 @@
 
                 <li class="actions preview">
                     {% trans 'Preview' as preview_label %}
-                    {% if display_modes|length > 1 %}
+                    {% if preview_modes|length > 1 %}
                         <div class="dropdown dropup dropdown-button match-width">
                             {% include "wagtailadmin/pages/_preview_button_on_create.html" with label=preview_label icon=1 %}
                             <div class="dropdown-toggle icon icon-arrow-up"></div>
                             <ul role="menu">
-                                {% for mode_name, mode_display_name in display_modes %}
+                                {% for mode_name, mode_display_name in preview_modes %}
                                     <li>
                                         {% include "wagtailadmin/pages/_preview_button_on_create.html" with mode=mode_name label=mode_display_name %}
                                     </li>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
index 901ee0ac1..8cc7fdca6 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
@@ -47,12 +47,12 @@
 
                 <li class="actions preview">
                     {% trans 'Preview' as preview_label %}
-                    {% if display_modes|length > 1 %}
+                    {% if preview_modes|length > 1 %}
                         <div class="dropdown dropup dropdown-button match-width">
                             {% include "wagtailadmin/pages/_preview_button_on_edit.html" with label=preview_label icon=1 %}
                             <div class="dropdown-toggle icon icon-arrow-up"></div>
                             <ul role="menu">
-                                {% for mode_name, mode_display_name in display_modes %}
+                                {% for mode_name, mode_display_name in preview_modes %}
                                     <li>
                                         {% include "wagtailadmin/pages/_preview_button_on_edit.html" with mode=mode_name label=mode_display_name %}
                                     </li>
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index e5a0c885c..6d6157d33 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -230,7 +230,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
         'page_class': page_class,
         'parent_page': parent_page,
         'edit_handler': edit_handler,
-        'display_modes': page.preview_modes,
+        'preview_modes': page.preview_modes,
         'form': form, # Used in unit tests
     })
 
@@ -361,7 +361,7 @@ def edit(request, page_id):
         'page': page,
         'edit_handler': edit_handler,
         'errors_debug': errors_debug,
-        'display_modes': page.preview_modes,
+        'preview_modes': page.preview_modes,
         'form': form, # Used in unit tests
     })
 
@@ -421,7 +421,7 @@ def preview_on_edit(request, page_id):
         response = render(request, 'wagtailadmin/pages/edit.html', {
             'page': page,
             'edit_handler': edit_handler,
-            'display_modes': page.preview_modes,
+            'preview_modes': page.preview_modes,
         })
         response['X-Wagtail-Preview'] = 'error'
         return response
@@ -469,7 +469,7 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p
             'page_class': page_class,
             'parent_page': parent_page,
             'edit_handler': edit_handler,
-            'display_modes': page.preview_modes,
+            'preview_modes': page.preview_modes,
         })
         response['X-Wagtail-Preview'] = 'error'
         return response

From 78abe31b058729574c9c09596d38b1f7e2013ddc Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 3 Jul 2014 15:15:12 +0100
Subject: [PATCH 051/154] Cleanup a few methods of UserPagePermissionsProxy

---
 wagtail/wagtailcore/models.py | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index b980d7f54..928dc5f64 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -960,10 +960,9 @@ class UserPagePermissionsProxy(object):
 
         return editable_pages
 
-
     def can_edit_pages(self):
         """Return True if the user has permission to edit any pages"""
-        return True if self.editable_pages().count() else False
+        return self.editable_pages().exists()
 
     def publishable_pages(self):
         """Return a queryset of the pages that this user has permission to publish"""
@@ -973,27 +972,18 @@ class UserPagePermissionsProxy(object):
         if self.user.is_superuser:
             return Page.objects.all()
 
-        # Translate each of the user's permission rules into a Q-expression
-        q_expressions = []
-        for perm in self.permissions:
-            if perm.permission_type == 'publish':
-                # user has publish permission on any subpage of perm.page
-                # (including perm.page itself)
-                q_expressions.append(
-                    Q(path__startswith=perm.page.path)
-                )
+        publishable_pages = Page.objects.none()
 
-        if q_expressions:
-            all_rules = q_expressions[0]
-            for expr in q_expressions[1:]:
-                all_rules = all_rules | expr
-            return Page.objects.filter(all_rules)
-        else:
-            return Page.objects.none()
+        for perm in self.permissions.filter(permission_type='publish'):
+            # user has publish permission on any subpage of perm.page
+            # (including perm.page itself)
+            publishable_pages |= Page.objects.descendant_of(perm.page, inclusive=True)
+
+        return publishable_pages
 
     def can_publish_pages(self):
         """Return True if the user has permission to publish any pages"""
-        return True if self.publishable_pages().count() else False
+        return self.publishable_pages().exists()
 
 
 class PagePermissionTester(object):

From 493fc29c08ccd91349551e9921806a5d7cd501d1 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 3 Jul 2014 15:21:46 +0100
Subject: [PATCH 052/154] Deprecate the `show_as_mode` method in favour of
 `serve_preview` which additionally takes a 'request' argument

---
 docs/building_your_site/djangodevelopers.rst |  2 +-
 docs/model_recipes.rst                       |  2 +-
 wagtail/wagtailadmin/views/pages.py          | 27 +++++++++++++-
 wagtail/wagtailcore/models.py                | 39 ++++++++++++++++----
 wagtail/wagtailforms/models.py               |  6 +--
 wagtail/wagtailforms/tests.py                |  4 +-
 6 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/docs/building_your_site/djangodevelopers.rst b/docs/building_your_site/djangodevelopers.rst
index e72573089..c24040364 100644
--- a/docs/building_your_site/djangodevelopers.rst
+++ b/docs/building_your_site/djangodevelopers.rst
@@ -214,7 +214,7 @@ Methods:
 * get_descendants
 * get_siblings
 * search
-* show_as_mode
+* serve_preview
 
 
 Page Queryset Methods
diff --git a/docs/model_recipes.rst b/docs/model_recipes.rst
index ae011126a..e799ef70a 100644
--- a/docs/model_recipes.rst
+++ b/docs/model_recipes.rst
@@ -194,7 +194,7 @@ Preview Modes
 -------------
 
 preview_modes
-show_as_mode
+serve_preview
 
 
 
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 6d6157d33..a1fb6bdae 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -1,3 +1,5 @@
+import warnings
+
 from django.http import Http404, HttpResponse
 from django.shortcuts import render, redirect, get_object_or_404
 from django.core.exceptions import ValidationError, PermissionDenied
@@ -396,6 +398,27 @@ def view_draft(request, page_id):
     return page.serve(request)
 
 
+def get_preview_response(page, preview_mode):
+    """
+    Helper function for preview_on_edit and preview_on_create -
+    return a page's preview response via either serve_preview or the deprecated
+    show_as_mode method
+    """
+    # Check the deprecated Page.show_as_mode method, as subclasses of Page
+    # might be overriding that to return a response
+    response = page.show_as_mode(preview_mode)
+    if response:
+        warnings.warn(
+            "Defining 'show_as_mode' on a page model is deprecated. Use 'serve_preview' instead",
+            DeprecationWarning
+        )
+        return response
+    else:
+        # show_as_mode did not return a response, so go ahead and use the 'proper'
+        # serve_preview method
+        return page.serve_preview(page.dummy_request(), preview_mode)
+
+
 @permission_required('wagtailadmin.access_admin')
 def preview_on_edit(request, page_id):
     # Receive the form submission that would typically be posted to the 'edit' view. If submission is valid,
@@ -410,7 +433,7 @@ def preview_on_edit(request, page_id):
         form.save(commit=False)
 
         preview_mode = request.GET.get('mode', page.default_preview_mode)
-        response = page.show_as_mode(preview_mode)
+        response = get_preview_response(page, preview_mode)
 
         response['X-Wagtail-Preview'] = 'ok'
         return response
@@ -455,7 +478,7 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p
         page.path = Page._get_children_path_interval(parent_page.path)[1]
 
         preview_mode = request.GET.get('mode', page.default_preview_mode)
-        response = page.show_as_mode(preview_mode)
+        response = get_preview_response(page, preview_mode)
 
         response['X-Wagtail-Preview'] = 'ok'
         return response
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 42e132daa..3d69873f9 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -725,15 +725,38 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
     def default_preview_mode(self):
         return self.preview_modes[0][0]
 
+    def serve_preview(self, request, mode_name):
+        """
+        Return an HTTP response for use in page previews. Normally this would be equivalent
+        to self.serve(request), since we obviously want the preview to be indicative of how
+        it looks on the live site. However, there are a couple of cases where this is not
+        appropriate, and custom behaviour is required:
+
+        1) The page has custom routing logic that derives some additional required
+        args/kwargs to be passed to serve(). The routing mechanism is bypassed when
+        previewing, so there's no way to know what args we should pass. In such a case,
+        the page model needs to implement its own version of serve_preview.
+
+        2) The page has several different renderings that we would like to be able to see
+        when previewing - for example, a form page might have one rendering that displays
+        the form, and another rendering to display a landing page when the form is posted.
+        This can be done by setting a custom preview_modes list on the page model -
+        Wagtail will allow the user to specify one of those modes when previewing, and
+        pass the chosen mode_name to serve_preview so that the page model can decide how
+        to render it appropriately. (Page models that do not specify their own preview_modes
+        list will always receive an empty string as mode_name.)
+
+        Any templates rendered during this process should use the 'request' object passed
+        here - this ensures that request.user and other properties are set appropriately for
+        the wagtail user bar to be displayed. This request will always be a GET.
+        """
+        return self.serve(request)
+
     def show_as_mode(self, mode_name):
-        """
-        Given an internal name from the preview_modes list, return an HTTP response
-        indicative of the page being viewed in that mode. By default this passes a
-        dummy request into the serve() mechanism, ensuring that it matches the behaviour
-        on the front-end; subclasses that define additional page modes will need to
-        implement alternative logic to serve up the appropriate view here.
-        """
-        return self.serve(self.dummy_request())
+        # Deprecated API for rendering previews. If this returns something other than None,
+        # we know that a subclass of Page has overridden this, and we should try to work with
+        # that response if possible.
+        return None
 
     def get_cached_paths(self):
         """
diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py
index 6bde684ac..79dcaa0e2 100644
--- a/wagtail/wagtailforms/models.py
+++ b/wagtail/wagtailforms/models.py
@@ -175,13 +175,13 @@ class AbstractForm(Page):
         ('landing', 'Landing page'),
     ]
 
-    def show_as_mode(self, mode):
+    def serve_preview(self, request, mode):
         if mode == 'landing':
-            return render(self.dummy_request(), self.landing_page_template, {
+            return render(request, self.landing_page_template, {
                 'self': self,
             })
         else:
-            return super(AbstractForm, self).show_as_mode(mode)
+            return super(AbstractForm, self).serve_preview(request, mode)
 
 
 class AbstractEmailForm(AbstractForm):
diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py
index 38903d2ff..28df108ab 100644
--- a/wagtail/wagtailforms/tests.py
+++ b/wagtail/wagtailforms/tests.py
@@ -61,7 +61,7 @@ class TestPageModes(TestCase):
         self.form_page = Page.objects.get(url_path='/home/contact-us/').specific
 
     def test_form(self):
-        response = self.form_page.show_as_mode('form')
+        response = self.form_page.serve_preview(self.form_page.dummy_request(), 'form')
 
         # Check response
         self.assertContains(response, """<label for="id_your-email">Your email</label>""")
@@ -69,7 +69,7 @@ class TestPageModes(TestCase):
         self.assertTemplateNotUsed(response, 'tests/form_page_landing.html')
 
     def test_landing(self):
-        response = self.form_page.show_as_mode('landing')
+        response = self.form_page.serve_preview(self.form_page.dummy_request(), 'landing')
 
         # Check response
         self.assertContains(response, "Thank you for your feedback.")

From a1bf11113adb68216b0e703290a958ec8bc0b9dd Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 3 Jul 2014 15:51:24 +0100
Subject: [PATCH 053/154] update view_draft and preview_for_moderation to call
 serve_preview (rather than serve, which for some page models might require
 additional args/kwargs)

---
 wagtail/wagtailadmin/views/pages.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index a1fb6bdae..013ce40c0 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -9,6 +9,7 @@ from django.contrib.auth.decorators import permission_required
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.utils import timezone
 from django.utils.translation import ugettext as _
+from django.views.decorators.http import require_GET
 from django.views.decorators.vary import vary_on_headers
 
 from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList
@@ -395,7 +396,7 @@ def delete(request, page_id):
 @permission_required('wagtailadmin.access_admin')
 def view_draft(request, page_id):
     page = get_object_or_404(Page, id=page_id).get_latest_revision_as_page()
-    return page.serve(request)
+    return page.serve_preview(page.dummy_request(), page.default_preview_mode)
 
 
 def get_preview_response(page, preview_mode):
@@ -729,6 +730,7 @@ def reject_moderation(request, revision_id):
 
 
 @permission_required('wagtailadmin.access_admin')
+@require_GET
 def preview_for_moderation(request, revision_id):
     revision = get_object_or_404(PageRevision, id=revision_id)
     if not revision.page.permissions_for_user(request.user).can_publish():
@@ -742,4 +744,6 @@ def preview_for_moderation(request, revision_id):
 
     request.revision_id = revision_id
 
-    return page.serve(request)
+    # pass in the real user request rather than page.dummy_request(), so that request.user
+    # and request.revision_id will be picked up by the wagtail user bar
+    return page.serve_preview(request, page.default_preview_mode)

From c0d2a70d6d39dbfbfab21f770faf0ca698c3b38c Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 3 Jul 2014 16:46:10 +0100
Subject: [PATCH 054/154] output a DeprecationWarning if get_page_modes has
 been overridden

---
 wagtail/wagtailcore/models.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 3d69873f9..dfc6ef0a9 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -706,6 +706,8 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
                                 "request middleware returned a response")
         return request
 
+    DEFAULT_PREVIEW_MODES = [('', 'Default')]
+
     @property
     def preview_modes(self):
         """
@@ -715,11 +717,16 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
         for example, a page containing a form might have a default view of the form,
         and a post-submission 'thankyou' page
         """
-        return self.get_page_modes()
+        modes = self.get_page_modes()
+        if modes is not Page.DEFAULT_PREVIEW_MODES:
+            # User has overriden get_page_modes instead of using preview_modes
+            warnings.warn("Overriding get_page_modes is deprecated. Define a preview_modes property instead", DeprecationWarning)
+
+        return modes
 
     def get_page_modes(self):
         # Deprecated accessor for the preview_modes property
-        return [('', 'Default')]
+        return Page.DEFAULT_PREVIEW_MODES
 
     @property
     def default_preview_mode(self):

From dcca9bd515f5bfbaed35c912236573d85a41d473 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 10:24:32 +0100
Subject: [PATCH 055/154] Use a multi_match query instead of a query_string
 query

---
 .../wagtailsearch/backends/elasticsearch.py   |  4 +--
 .../tests/test_elasticsearch_backend.py       | 26 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index 289b0f4b2..c28b676ee 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -258,14 +258,14 @@ class ElasticSearchQuery(object):
         # Query
         if self.query_string is not None:
             query = {
-                'query_string': {
+                'multi_match': {
                     'query': self.query_string,
                 }
             }
 
             # Fields
             if self.fields:
-                query['query_string']['fields'] = self.fields
+                query['multi_match']['fields'] = self.fields
         else:
             query = {
                 'match_all': {}
diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
index 0c7906b39..6d2df3b4c 100644
--- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
+++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
@@ -88,7 +88,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.all(), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_none_query_string(self):
@@ -104,7 +104,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title="Test"), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_and_filter(self):
@@ -112,7 +112,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title="Test", live=True), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'and': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'and': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
 
         # Make sure field filters are sorted (as they can be in any order which may cause false positives)
         query = query.to_es()
@@ -131,7 +131,7 @@ class TestElasticSearchQuery(TestCase):
         field_filters[:] = sorted(field_filters, key=lambda f: list(f['term'].keys())[0])
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'or': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'or': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query, expected_result)
 
     def test_negated_filter(self):
@@ -139,7 +139,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.exclude(live=True), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'term': {'live_filter': True}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'term': {'live_filter': True}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_fields(self):
@@ -147,7 +147,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.all(), "Hello", fields=['title'])
 
         # Check it
-        expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'query_string': {'query': 'Hello', 'fields': ['title']}}}}
+        expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['title']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_exact_lookup(self):
@@ -155,7 +155,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__exact="Test"), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_none_lookup(self):
@@ -163,7 +163,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title=None), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_isnull_true_lookup(self):
@@ -171,7 +171,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__isnull=True), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_isnull_false_lookup(self):
@@ -179,7 +179,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__isnull=False), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'missing': {'field': 'title_filter'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'missing': {'field': 'title_filter'}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_startswith_lookup(self):
@@ -187,7 +187,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__startswith="Test"), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'prefix': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'prefix': {'title_filter': 'Test'}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_gt_lookup(self):
@@ -198,7 +198,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__gt=datetime.datetime(2014, 4, 29)), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gt': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gt': '2014-04-29'}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_range_lookup(self):
@@ -209,7 +209,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__range=(start_date, end_date)), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gte': '2014-04-29', 'lte': '2014-08-19'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gte': '2014-04-29', 'lte': '2014-08-19'}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
 

From 7fc10398ddc657cc1708be8ce01b5285118b8598 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 10:31:50 +0100
Subject: [PATCH 056/154] Minor optimisation when building single field queries

---
 .../wagtailsearch/backends/elasticsearch.py   | 24 ++++++++++++-------
 .../tests/test_elasticsearch_backend.py       |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py
index c28b676ee..55f1971a2 100644
--- a/wagtail/wagtailsearch/backends/elasticsearch.py
+++ b/wagtail/wagtailsearch/backends/elasticsearch.py
@@ -121,7 +121,7 @@ class ElasticSearchQuery(object):
     def __init__(self, queryset, query_string, fields=None):
         self.queryset = queryset
         self.query_string = query_string
-        self.fields = fields or ['_all', '_partials']
+        self.fields = fields
 
     def _get_filters_from_where(self, where_node):
         # Check if this is a leaf node
@@ -257,15 +257,21 @@ class ElasticSearchQuery(object):
     def to_es(self):
         # Query
         if self.query_string is not None:
-            query = {
-                'multi_match': {
-                    'query': self.query_string,
-                }
-            }
+            fields = self.fields or ['_all', '_partials']
 
-            # Fields
-            if self.fields:
-                query['multi_match']['fields'] = self.fields
+            if len(fields) == 1:
+                query = {
+                    'match': {
+                        fields[0]: self.query_string,
+                    }
+                }
+            else:
+                query = {
+                    'multi_match': {
+                        'query': self.query_string,
+                        'fields': fields,
+                    }
+                }
         else:
             query = {
                 'match_all': {}
diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
index 6d2df3b4c..eeb23ff33 100644
--- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
+++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
@@ -147,7 +147,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.all(), "Hello", fields=['title'])
 
         # Check it
-        expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['title']}}}}
+        expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'match': {'title': 'Hello'}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_exact_lookup(self):

From fe3c2e6c0b1b2faed8c696e8919b2ae953a393ef Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 11:33:34 +0100
Subject: [PATCH 057/154] Added __repr__ to EditorsPicK

---
 wagtail/wagtailsearch/models.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py
index abb479295..dd2a0cb69 100644
--- a/wagtail/wagtailsearch/models.py
+++ b/wagtail/wagtailsearch/models.py
@@ -76,6 +76,9 @@ class EditorsPick(models.Model):
     sort_order = models.IntegerField(null=True, blank=True, editable=False)
     description = models.TextField(blank=True)
 
+    def __repr__(self):
+        return 'EditorsPick(query="' + self.query.query_string + '", page="' + self.page.title + '")'
+
     class Meta:
         ordering = ('sort_order', )
 

From c7ec5792f689e0b9c7324edfd170ec01c85ddb6b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 11:34:13 +0100
Subject: [PATCH 058/154] Make sure all editors picks are resaved on edit.
 Fixes #408

As we are setting the sort_order manually. The formset doesn't think the editors pick has changed so doesn't save it.
This caused a SQLite test to fail as NULL is always greater than any integer causing ordering to be incorrect.
---
 wagtail/wagtailsearch/views/editorspicks.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wagtail/wagtailsearch/views/editorspicks.py b/wagtail/wagtailsearch/views/editorspicks.py
index 8e1155922..fe45a7c56 100644
--- a/wagtail/wagtailsearch/views/editorspicks.py
+++ b/wagtail/wagtailsearch/views/editorspicks.py
@@ -55,6 +55,9 @@ def save_editorspicks(query, new_query, editors_pick_formset):
         for i, form in enumerate(editors_pick_formset.ordered_forms):
             form.instance.sort_order = i
 
+            # Make sure the form is marked as changed so it gets saved with the new order
+            form.has_changed = lambda: True
+
         editors_pick_formset.save()
 
         # If query was changed, move all editors picks to the new query

From 56647908d0eab38874787c79190df2c53541393a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 11:39:42 +0100
Subject: [PATCH 059/154] Improved test_post_reorder test

---
 wagtail/wagtailsearch/tests/test_editorspicks.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wagtail/wagtailsearch/tests/test_editorspicks.py b/wagtail/wagtailsearch/tests/test_editorspicks.py
index b2ebece9f..0888d115c 100644
--- a/wagtail/wagtailsearch/tests/test_editorspicks.py
+++ b/wagtail/wagtailsearch/tests/test_editorspicks.py
@@ -218,6 +218,10 @@ class TestEditorsPicksEditView(TestCase, WagtailTestUtils):
         # User should be redirected back to the index
         self.assertRedirects(response, reverse('wagtailsearch_editorspicks_index'))
 
+        # Check that the ordering has been saved correctly
+        self.assertEqual(models.EditorsPick.objects.get(id=self.editors_pick.id).sort_order, 1)
+        self.assertEqual(models.EditorsPick.objects.get(id=self.editors_pick_2.id).sort_order, 0)
+
         # Check that the recommendations were reordered
         self.assertEqual(models.Query.get("Hello").editors_picks.all()[0], self.editors_pick_2)
         self.assertEqual(models.Query.get("Hello").editors_picks.all()[1], self.editors_pick)

From 6e32b6cf9b296edc48730fba5ae3640f47b3bef5 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Mon, 2 Jun 2014 14:18:19 +0100
Subject: [PATCH 060/154] Update Page.route API so that it returns a Page
 instance rather than an HttpResponse; catch the latter in the 'serve' view
 for backward compatibility

---
 wagtail/tests/fixtures/test.json             | 25 +++++++++++++++++++-
 wagtail/tests/models.py                      | 13 ++++++++++
 wagtail/wagtailcore/models.py                |  2 +-
 wagtail/wagtailcore/tests/test_page_model.py | 21 ++++++++++++++--
 wagtail/wagtailcore/views.py                 | 14 +++++++++--
 5 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json
index 2d3db6e35..b769b7960 100644
--- a/wagtail/tests/fixtures/test.json
+++ b/wagtail/tests/fixtures/test.json
@@ -23,7 +23,7 @@
     "model": "wagtailcore.page",
     "fields": {
         "title": "Welcome to the Wagtail test site!",
-        "numchild": 3,
+        "numchild": 4,
         "show_in_menus": false,
         "live": true,
         "depth": 2,
@@ -257,6 +257,29 @@
     }
 },
 
+{
+    "pk": 10,
+    "model": "wagtailcore.page",
+    "fields": {
+        "title": "Old style route method",
+        "numchild": 0,
+        "show_in_menus": true,
+        "live": true,
+        "depth": 3,
+        "content_type": ["tests", "pagewitholdstyleroutemethod"],
+        "path": "000100010004",
+        "url_path": "/home/old-style-route/",
+        "slug": "old-style-route"
+    }
+},
+{
+    "pk": 10,
+    "model": "tests.pagewitholdstyleroutemethod",
+    "fields": {
+        "content": "<p>Test with old style route method</p>"
+    }
+},
+
 {
     "pk": 1,
     "model": "wagtailcore.site",
diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index ff6dc2dcc..0c369dd34 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -106,6 +106,19 @@ class SimplePage(Page):
     content = models.TextField()
 
 
+class PageWithOldStyleRouteMethod(Page):
+    """
+    Prior to Wagtail 0.4, the route() method on Page returned an HttpResponse
+    rather than a Page instance. As subclasses of Page may override route,
+    we need to continue accepting this convention (albeit as a deprecated API).
+    """
+    content = models.TextField()
+    template = 'tests/simple_page.html'
+
+    def route(self, request, path_components):
+        return self.serve(request)
+
+
 # Event page
 
 class EventPageCarouselItem(Orderable, CarouselItem):
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index cf33bcbfb..d8edbfc72 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -415,7 +415,7 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
         else:
             # request is for this very page
             if self.live:
-                return self.serve(request)
+                return self
             else:
                 raise Http404
 
diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index da9fc6174..0543bf32c 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -2,7 +2,7 @@ from django.test import TestCase, Client
 from django.http import HttpRequest, Http404
 
 from wagtail.wagtailcore.models import Page, Site
-from wagtail.tests.models import EventPage, EventIndex, SimplePage
+from wagtail.tests.models import EventPage, EventIndex, SimplePage, PageWithOldStyleRouteMethod
 
 
 class TestSiteRouting(TestCase):
@@ -136,8 +136,13 @@ class TestRouting(TestCase):
 
         request = HttpRequest()
         request.path = '/events/christmas/'
-        response = homepage.route(request, ['events', 'christmas'])
+        found_page = homepage.route(request, ['events', 'christmas'])
+        self.assertEqual(found_page, christmas_page)
 
+    def test_request_serving(self):
+        christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
+        request = HttpRequest()
+        response = christmas_page.serve(request)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context_data['self'], christmas_page)
         used_template = response.resolve_template(response.template_name)
@@ -226,6 +231,18 @@ class TestServeView(TestCase):
         self.assertContains(response, '<a href="/events/christmas/">Christmas</a>')
 
 
+    def test_old_style_routing(self):
+        """
+        Test that route() methods that return an HttpResponse are correctly handled
+        """
+        response = self.client.get('/old-style-route/')
+        expected_page = PageWithOldStyleRouteMethod.objects.get(url_path='/home/old-style-route/')
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['self'], expected_page)
+        self.assertEqual(response.templates[0].name, 'tests/simple_page.html')
+
+
 class TestStaticSitePaths(TestCase):
     def setUp(self):
         self.root_page = Page.objects.get(id=1)
diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py
index 1b1f6cf43..7377cf761 100644
--- a/wagtail/wagtailcore/views.py
+++ b/wagtail/wagtailcore/views.py
@@ -1,4 +1,6 @@
-from django.http import Http404
+import warnings
+
+from django.http import HttpResponse, Http404
 
 
 def serve(request, path):
@@ -8,4 +10,12 @@ def serve(request, path):
         raise Http404
 
     path_components = [component for component in path.split('/') if component]
-    return request.site.root_page.specific.route(request, path_components)
+    page = request.site.root_page.specific.route(request, path_components)
+    if isinstance(page, HttpResponse):
+        warnings.warn(
+            "Page.route should return a Page, not an HttpResponse",
+            DeprecationWarning
+        )
+        return page
+
+    return page.serve(request)

From 9cc3614097b1ea645eabf63a45fe6e2338a641af Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Mon, 2 Jun 2014 23:00:20 +0100
Subject: [PATCH 061/154] Catch the deprecation warning for old-style routes
 during unit tests

---
 wagtail/wagtailcore/tests/test_page_model.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index 0543bf32c..34f8356f2 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -1,3 +1,5 @@
+import warnings
+
 from django.test import TestCase, Client
 from django.http import HttpRequest, Http404
 
@@ -235,9 +237,15 @@ class TestServeView(TestCase):
         """
         Test that route() methods that return an HttpResponse are correctly handled
         """
-        response = self.client.get('/old-style-route/')
-        expected_page = PageWithOldStyleRouteMethod.objects.get(url_path='/home/old-style-route/')
+        with warnings.catch_warnings(record=True) as w:
+            response = self.client.get('/old-style-route/')
 
+            # Check that a DeprecationWarning has been triggered
+            self.assertEqual(len(w), 1)
+            self.assertTrue(issubclass(w[-1].category, DeprecationWarning))
+            self.assertTrue("Page.route should return a Page" in str(w[-1].message))
+
+        expected_page = PageWithOldStyleRouteMethod.objects.get(url_path='/home/old-style-route/')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['self'], expected_page)
         self.assertEqual(response.templates[0].name, 'tests/simple_page.html')

From df15ece5dcef3962b5c0b2ee914018491bf20e9a Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Mon, 2 Jun 2014 23:30:00 +0100
Subject: [PATCH 062/154] Implement before_serve_page hook

---
 wagtail/tests/wagtail_hooks.py               | 8 ++++++++
 wagtail/wagtailcore/tests/test_page_model.py | 4 ++++
 wagtail/wagtailcore/views.py                 | 7 +++++++
 3 files changed, 19 insertions(+)

diff --git a/wagtail/tests/wagtail_hooks.py b/wagtail/tests/wagtail_hooks.py
index 13e3e46d2..4ad63e881 100644
--- a/wagtail/tests/wagtail_hooks.py
+++ b/wagtail/tests/wagtail_hooks.py
@@ -1,3 +1,5 @@
+from django.http import HttpResponse
+
 from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.whitelist import attribute_rule, check_url, allow_without_attributes
 
@@ -17,3 +19,9 @@ def whitelister_element_rules():
         'a': attribute_rule({'href': check_url, 'target': True}),
     }
 hooks.register('construct_whitelister_element_rules', whitelister_element_rules)
+
+
+def block_googlebot(page, request):
+    if request.META.get('HTTP_USER_AGENT') == 'GoogleBot':
+        return HttpResponse("<h1>bad googlebot no cookie</h1>")
+hooks.register('before_serve_page', block_googlebot)
diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index 34f8356f2..ab5b9c148 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -250,6 +250,10 @@ class TestServeView(TestCase):
         self.assertEqual(response.context['self'], expected_page)
         self.assertEqual(response.templates[0].name, 'tests/simple_page.html')
 
+    def test_before_serve_hook(self):
+        response = self.client.get('/events/', HTTP_USER_AGENT='GoogleBot')
+        self.assertContains(response, 'bad googlebot no cookie')
+
 
 class TestStaticSitePaths(TestCase):
     def setUp(self):
diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py
index 7377cf761..0872dd68f 100644
--- a/wagtail/wagtailcore/views.py
+++ b/wagtail/wagtailcore/views.py
@@ -2,6 +2,8 @@ import warnings
 
 from django.http import HttpResponse, Http404
 
+from wagtail.wagtailcore import hooks
+
 
 def serve(request, path):
     # we need a valid Site object corresponding to this request (set in wagtail.wagtailcore.middleware.SiteMiddleware)
@@ -18,4 +20,9 @@ def serve(request, path):
         )
         return page
 
+    for fn in hooks.get_hooks('before_serve_page'):
+        result = fn(page, request)
+        if isinstance(result, HttpResponse):
+            return result
+
     return page.serve(request)

From 4af5f3d24d50ebaa0f65dba76b678115c3afca07 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 3 Jun 2014 11:22:46 +0100
Subject: [PATCH 063/154] Add PageViewRestriction model, and apply permission
 check in the 'serve' view

---
 .../0005_create_page_view_restriction.py      | 117 ++++++++++++++++++
 wagtail/wagtailcore/models.py                 |   7 ++
 wagtail/wagtailcore/wagtail_hooks.py          |  11 ++
 3 files changed, 135 insertions(+)
 create mode 100644 wagtail/wagtailcore/migrations/0005_create_page_view_restriction.py
 create mode 100644 wagtail/wagtailcore/wagtail_hooks.py

diff --git a/wagtail/wagtailcore/migrations/0005_create_page_view_restriction.py b/wagtail/wagtailcore/migrations/0005_create_page_view_restriction.py
new file mode 100644
index 000000000..f2d79573f
--- /dev/null
+++ b/wagtail/wagtailcore/migrations/0005_create_page_view_restriction.py
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'PageViewRestriction'
+        db.create_table('wagtailcore_pageviewrestriction', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('page', self.gf('django.db.models.fields.related.ForeignKey')(related_name='view_restrictions', to=orm['wagtailcore.Page'])),
+            ('password', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal('wagtailcore', ['PageViewRestriction'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'PageViewRestriction'
+        db.delete_table('wagtailcore_pageviewrestriction')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'wagtailcore.grouppagepermission': {
+            'Meta': {'object_name': 'GroupPagePermission'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': "orm['auth.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': "orm['wagtailcore.Page']"}),
+            'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
+        'wagtailcore.page': {
+            'Meta': {'object_name': 'Page'},
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}),
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'expire_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['auth.User']"}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        'wagtailcore.pagerevision': {
+            'Meta': {'object_name': 'PageRevision'},
+            'approved_go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'content_json': ('django.db.models.fields.TextField', [], {}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': "orm['wagtailcore.Page']"}),
+            'submitted_for_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'wagtailcore.pageviewrestriction': {
+            'Meta': {'object_name': 'PageViewRestriction'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'view_restrictions'", 'to': "orm['wagtailcore.Page']"}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'wagtailcore.site': {
+            'Meta': {'unique_together': "(('hostname', 'port'),)", 'object_name': 'Site'},
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}),
+            'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': "orm['wagtailcore.Page']"})
+        }
+    }
+
+    complete_apps = ['wagtailcore']
\ No newline at end of file
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index d8edbfc72..b035a0856 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -9,6 +9,8 @@ from modelcluster.models import ClusterableModel
 
 from django.db import models, connection, transaction
 from django.db.models import get_model, Q
+from django.db.models.signals import post_save
+from django.dispatch import receiver
 from django.http import Http404
 from django.core.cache import cache
 from django.core.handlers.wsgi import WSGIRequest
@@ -1150,3 +1152,8 @@ class PagePermissionTester(object):
         else:
             # no publishing required, so the already-tested 'add' permission is sufficient
             return True
+
+
+class PageViewRestriction(models.Model):
+    page = models.ForeignKey('Page', related_name='view_restrictions')
+    password = models.CharField(max_length=255)
diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py
new file mode 100644
index 000000000..1dd480001
--- /dev/null
+++ b/wagtail/wagtailcore/wagtail_hooks.py
@@ -0,0 +1,11 @@
+from django.http import HttpResponse
+
+from wagtail.wagtailcore import hooks
+from wagtail.wagtailcore.models import PageViewRestriction
+
+def check_view_restrictions(page, request):
+    ancestors_and_self = list(page.get_ancestors().values_list('id', flat=True)) + [page]
+    restrictions = PageViewRestriction.objects.filter(page__in=ancestors_and_self)
+    for restriction in restrictions:
+        return HttpResponse("<h1>Blocked due to view restriction</h1>")
+hooks.register('before_serve_page', check_view_restrictions)

From 6f855d7fd86556956248ded90c7e27832b3a713d Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 3 Jun 2014 15:34:27 +0100
Subject: [PATCH 064/154] simplified get_ancestors logic

---
 wagtail/wagtailcore/wagtail_hooks.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py
index 1dd480001..73c98a01d 100644
--- a/wagtail/wagtailcore/wagtail_hooks.py
+++ b/wagtail/wagtailcore/wagtail_hooks.py
@@ -4,8 +4,7 @@ from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import PageViewRestriction
 
 def check_view_restrictions(page, request):
-    ancestors_and_self = list(page.get_ancestors().values_list('id', flat=True)) + [page]
-    restrictions = PageViewRestriction.objects.filter(page__in=ancestors_and_self)
+    restrictions = PageViewRestriction.objects.filter(page__in=page.get_ancestors(inclusive=True))
     for restriction in restrictions:
         return HttpResponse("<h1>Blocked due to view restriction</h1>")
 hooks.register('before_serve_page', check_view_restrictions)

From d0e93f997f5caf8be28989d1907413f12c3e9b56 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 3 Jun 2014 17:24:04 +0100
Subject: [PATCH 065/154] Delegate serving of the 'password required' response
 to the Page model

---
 wagtail/wagtailcore/models.py                            | 8 ++++++++
 .../templates/wagtailcore/password_required.html         | 9 +++++++++
 wagtail/wagtailcore/wagtail_hooks.py                     | 4 +---
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 wagtail/wagtailcore/templates/wagtailcore/password_required.html

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index b035a0856..59c9eb861 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -811,6 +811,14 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
     def get_prev_siblings(self, inclusive=False):
         return self.get_siblings(inclusive).filter(path__lte=self.path).order_by('-path')
 
+    password_required_template = getattr(settings, 'PASSWORD_REQUIRED_TEMPLATE', 'wagtailcore/password_required.html')
+    def serve_password_required_response(self, request, form):
+        return TemplateResponse(request, self.password_required_template, {
+            'self': self,
+            'request': request,
+            'form': form,
+        })
+
 
 def get_navigation_menu_items():
     # Get all pages that appear in the navigation menu: ones which have children,
diff --git a/wagtail/wagtailcore/templates/wagtailcore/password_required.html b/wagtail/wagtailcore/templates/wagtailcore/password_required.html
new file mode 100644
index 000000000..d4ee0b1fc
--- /dev/null
+++ b/wagtail/wagtailcore/templates/wagtailcore/password_required.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+    <head>
+        <title>Password required</title>
+    </head>
+    <body>
+        <h1>Password required</h1>
+    </body>
+</html>
diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py
index 73c98a01d..347194c32 100644
--- a/wagtail/wagtailcore/wagtail_hooks.py
+++ b/wagtail/wagtailcore/wagtail_hooks.py
@@ -1,10 +1,8 @@
-from django.http import HttpResponse
-
 from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import PageViewRestriction
 
 def check_view_restrictions(page, request):
     restrictions = PageViewRestriction.objects.filter(page__in=page.get_ancestors(inclusive=True))
     for restriction in restrictions:
-        return HttpResponse("<h1>Blocked due to view restriction</h1>")
+        return page.serve_password_required_response(request, None)
 hooks.register('before_serve_page', check_view_restrictions)

From e4008a814824a24f36c288f7309c4867b8919870 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 4 Jun 2014 15:28:03 +0100
Subject: [PATCH 066/154] implement form submission logic for the password form

---
 wagtail/wagtailcore/forms.py                  | 16 +++++++++++++
 wagtail/wagtailcore/models.py                 | 18 +++++++++-----
 .../wagtailcore/password_required.html        |  6 +++++
 wagtail/wagtailcore/urls.py                   |  5 +++-
 wagtail/wagtailcore/views.py                  | 24 +++++++++++++++++++
 wagtail/wagtailcore/wagtail_hooks.py          | 10 +++++++-
 6 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 wagtail/wagtailcore/forms.py

diff --git a/wagtail/wagtailcore/forms.py b/wagtail/wagtailcore/forms.py
new file mode 100644
index 000000000..1b83c8c94
--- /dev/null
+++ b/wagtail/wagtailcore/forms.py
@@ -0,0 +1,16 @@
+from django import forms
+
+class PasswordPageViewRestrictionForm(forms.Form):
+    password = forms.CharField(label="Password", widget=forms.PasswordInput)
+    return_url = forms.CharField(widget=forms.HiddenInput)
+
+    def __init__(self, *args, **kwargs):
+        self.restriction = kwargs.pop('instance')
+        super(PasswordPageViewRestrictionForm, self).__init__(*args, **kwargs)
+
+    def clean_password(self):
+        data = self.cleaned_data['password']
+        if data != self.restriction.password:
+            raise forms.ValidationError("The password you have entered is not correct. Please try again.")
+
+        return data
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 59c9eb861..08e1b612b 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -812,12 +812,18 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
         return self.get_siblings(inclusive).filter(path__lte=self.path).order_by('-path')
 
     password_required_template = getattr(settings, 'PASSWORD_REQUIRED_TEMPLATE', 'wagtailcore/password_required.html')
-    def serve_password_required_response(self, request, form):
-        return TemplateResponse(request, self.password_required_template, {
-            'self': self,
-            'request': request,
-            'form': form,
-        })
+    def serve_password_required_response(self, request, form, action_url):
+        """
+        Serve a response indicating that the user has been denied access to view this page,
+        and must supply a password.
+        form = a Django form object containing the password input
+            (and zero or more hidden fields that also need to be output on the template)
+        action_url = URL that this form should be POSTed to
+        """
+        context = self.get_context(request)
+        context['form'] = form
+        context['action_url'] = action_url
+        return TemplateResponse(request, self.password_required_template, context)
 
 
 def get_navigation_menu_items():
diff --git a/wagtail/wagtailcore/templates/wagtailcore/password_required.html b/wagtail/wagtailcore/templates/wagtailcore/password_required.html
index d4ee0b1fc..d7601ca69 100644
--- a/wagtail/wagtailcore/templates/wagtailcore/password_required.html
+++ b/wagtail/wagtailcore/templates/wagtailcore/password_required.html
@@ -5,5 +5,11 @@
     </head>
     <body>
         <h1>Password required</h1>
+        <p>You need a password to access this page.</p>
+        <form action="{{ action_url }}" method="POST">
+            {% csrf_token %}
+            {{ form.as_p }}
+            <input type="submit" value="Continue" />
+        </form>
     </body>
 </html>
diff --git a/wagtail/wagtailcore/urls.py b/wagtail/wagtailcore/urls.py
index f0336fec4..9777dea8a 100644
--- a/wagtail/wagtailcore/urls.py
+++ b/wagtail/wagtailcore/urls.py
@@ -2,7 +2,10 @@ from django.conf.urls import url
 from wagtail.wagtailcore import views
 
 urlpatterns = [
-    # All front-end views are handled through Wagtail's core.views.serve mechanism.
+    url(r'^_util/authenticate_with_password/(\d+)/(\d+)/$', views.authenticate_with_password,
+        name='wagtailcore_authenticate_with_password'),
+
+    # Front-end page views are handled through Wagtail's core.views.serve mechanism.
     # Here we match a (possibly empty) list of path segments, each followed by
     # a '/'. If a trailing slash is not present, we leave CommonMiddleware to
     # handle it as usual (i.e. redirect it to the trailing slash version if
diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py
index 0872dd68f..bd12d7f97 100644
--- a/wagtail/wagtailcore/views.py
+++ b/wagtail/wagtailcore/views.py
@@ -1,8 +1,12 @@
 import warnings
 
 from django.http import HttpResponse, Http404
+from django.shortcuts import get_object_or_404, redirect
+from django.core.urlresolvers import reverse
 
 from wagtail.wagtailcore import hooks
+from wagtail.wagtailcore.models import Page, PageViewRestriction
+from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm
 
 
 def serve(request, path):
@@ -26,3 +30,23 @@ def serve(request, path):
             return result
 
     return page.serve(request)
+
+
+def authenticate_with_password(request, page_view_restriction_id, page_id):
+    """
+    Handle a submission of PasswordPageViewRestrictionForm to grant view access over a
+    subtree that is protected by a PageViewRestriction
+    """
+    restriction = get_object_or_404(PageViewRestriction, id=page_view_restriction_id)
+    page = get_object_or_404(Page, id=page_id).specific
+
+    if request.POST:
+        form = PasswordPageViewRestrictionForm(request.POST, instance=restriction)
+        if form.is_valid():
+            # TODO: record 'has authenticated against this page view restriction' flag in the session
+            return redirect(form.cleaned_data['return_url'])
+    else:
+        form = PasswordPageViewRestrictionForm(instance=restriction)
+
+    action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id])
+    return page.serve_password_required_response(request, form, action_url)
diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py
index 347194c32..ccac0bd43 100644
--- a/wagtail/wagtailcore/wagtail_hooks.py
+++ b/wagtail/wagtailcore/wagtail_hooks.py
@@ -1,8 +1,16 @@
+from django.core.urlresolvers import reverse
+
 from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import PageViewRestriction
+from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm
 
 def check_view_restrictions(page, request):
     restrictions = PageViewRestriction.objects.filter(page__in=page.get_ancestors(inclusive=True))
+
     for restriction in restrictions:
-        return page.serve_password_required_response(request, None)
+        form = PasswordPageViewRestrictionForm(instance=restriction,
+            initial={'return_url': request.get_full_path()})
+        action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id])
+        return page.serve_password_required_response(request, form, action_url)
+
 hooks.register('before_serve_page', check_view_restrictions)

From 1e71e10cd22d18e170d45d05349b8427358c7153 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 4 Jun 2014 16:02:43 +0100
Subject: [PATCH 067/154] Keep track of passed page view restrictions in the
 session

---
 wagtail/wagtailcore/views.py         | 11 ++++++++++-
 wagtail/wagtailcore/wagtail_hooks.py | 13 ++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py
index bd12d7f97..78e0476b6 100644
--- a/wagtail/wagtailcore/views.py
+++ b/wagtail/wagtailcore/views.py
@@ -3,6 +3,7 @@ import warnings
 from django.http import HttpResponse, Http404
 from django.shortcuts import get_object_or_404, redirect
 from django.core.urlresolvers import reverse
+from django.conf import settings
 
 from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import Page, PageViewRestriction
@@ -43,7 +44,15 @@ def authenticate_with_password(request, page_view_restriction_id, page_id):
     if request.POST:
         form = PasswordPageViewRestrictionForm(request.POST, instance=restriction)
         if form.is_valid():
-            # TODO: record 'has authenticated against this page view restriction' flag in the session
+            has_existing_session = (settings.SESSION_COOKIE_NAME in request.COOKIES)
+            passed_restrictions = request.session.setdefault('passed_page_view_restrictions', [])
+            if restriction.id not in passed_restrictions:
+                passed_restrictions.append(restriction.id)
+            if not has_existing_session:
+                # if this is a session we've created, set it to expire at the end
+                # of the browser session
+                request.session.set_expiry(0)
+
             return redirect(form.cleaned_data['return_url'])
     else:
         form = PasswordPageViewRestrictionForm(instance=restriction)
diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py
index ccac0bd43..b2ab31248 100644
--- a/wagtail/wagtailcore/wagtail_hooks.py
+++ b/wagtail/wagtailcore/wagtail_hooks.py
@@ -7,10 +7,13 @@ from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm
 def check_view_restrictions(page, request):
     restrictions = PageViewRestriction.objects.filter(page__in=page.get_ancestors(inclusive=True))
 
-    for restriction in restrictions:
-        form = PasswordPageViewRestrictionForm(instance=restriction,
-            initial={'return_url': request.get_full_path()})
-        action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id])
-        return page.serve_password_required_response(request, form, action_url)
+    if restrictions:
+        passed_restrictions = request.session.get('passed_page_view_restrictions', [])
+        for restriction in restrictions:
+            if restriction.id not in passed_restrictions:
+                form = PasswordPageViewRestrictionForm(instance=restriction,
+                    initial={'return_url': request.get_full_path()})
+                action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id])
+                return page.serve_password_required_response(request, form, action_url)
 
 hooks.register('before_serve_page', check_view_restrictions)

From cae0d8fecbcfb428ecc0130045ab6bdfee463269 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 5 Jun 2014 11:04:37 +0100
Subject: [PATCH 068/154] add public/private indicator on explorer and page
 editor

---
 .../wagtailadmin/pages/_view_permission_indicator.html      | 6 ++++++
 wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html | 3 +++
 wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html | 5 ++++-
 wagtail/wagtailcore/models.py                               | 3 +++
 wagtail/wagtailcore/wagtail_hooks.py                        | 3 +--
 5 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
new file mode 100644
index 000000000..7f9c7d82b
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
@@ -0,0 +1,6 @@
+{% load i18n %}
+{% if page.get_view_restrictions %}
+    <div>{% trans 'Private' %}</div>
+{% else %}
+    <div>{% trans 'Public' %}</div>
+{% endif %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
index 8cc7fdca6..e56ad170c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
@@ -16,6 +16,9 @@
             <div class="right col3">
                  {% trans "Status:" %} {% if page.live %}<a href="{{ page.url }}" class="status-tag {% if page.live %}primary{% endif %}">{{ page.status_string }}</a>{% else %}<span class="status-tag">{{ page.status_string }}</span>{% endif %}
             </div>
+
+            {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=page only %}
+
         </div>
     </header>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 7258c5429..5fe32838e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -48,6 +48,9 @@
                         {% else %}
                             <h2>{{ parent_page.title }}</h2>
                         {% endif %}
+
+                        {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=parent_page only %}
+
                         <ul class="actions">
                             {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
                                 <li><a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}" class="button button-small">{% trans 'Edit' %}</a></li>
@@ -249,4 +252,4 @@
             </li>
         </ul>
     </div>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 08e1b612b..8670f0315 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -811,6 +811,9 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
     def get_prev_siblings(self, inclusive=False):
         return self.get_siblings(inclusive).filter(path__lte=self.path).order_by('-path')
 
+    def get_view_restrictions(self):
+        return PageViewRestriction.objects.filter(page__in=self.get_ancestors(inclusive=True))
+
     password_required_template = getattr(settings, 'PASSWORD_REQUIRED_TEMPLATE', 'wagtailcore/password_required.html')
     def serve_password_required_response(self, request, form, action_url):
         """
diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py
index b2ab31248..e92971c99 100644
--- a/wagtail/wagtailcore/wagtail_hooks.py
+++ b/wagtail/wagtailcore/wagtail_hooks.py
@@ -1,11 +1,10 @@
 from django.core.urlresolvers import reverse
 
 from wagtail.wagtailcore import hooks
-from wagtail.wagtailcore.models import PageViewRestriction
 from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm
 
 def check_view_restrictions(page, request):
-    restrictions = PageViewRestriction.objects.filter(page__in=page.get_ancestors(inclusive=True))
+    restrictions = page.get_view_restrictions()
 
     if restrictions:
         passed_restrictions = request.session.get('passed_page_view_restrictions', [])

From eaee2b9695842f4c38a79874a55eec1e0aeb4065 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 6 Jun 2014 12:52:34 +0100
Subject: [PATCH 069/154] Implement (mostly-empty) views for setting view
 restrictions, accessible from the permission indicator

---
 .../js/view-permission-indicator.js           |  9 +++++
 .../ancestor_restriction.html                 |  8 +++++
 .../set_view_restrictions.html                |  7 ++++
 .../wagtailadmin/pages/_editor_js.html        |  1 +
 .../pages/_view_permission_indicator.html     | 25 ++++++++++---
 .../templates/wagtailadmin/pages/edit.html    |  6 ++--
 .../templates/wagtailadmin/pages/index.html   |  4 +++
 .../templates/wagtailadmin/pages/list.html    |  2 +-
 wagtail/wagtailadmin/urls.py                  |  4 ++-
 .../views/page_view_restrictions.py           | 35 +++++++++++++++++++
 wagtail/wagtailcore/models.py                 |  3 ++
 11 files changed, 94 insertions(+), 10 deletions(-)
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
 create mode 100644 wagtail/wagtailadmin/views/page_view_restrictions.py

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js
new file mode 100644
index 000000000..52b7442a7
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js
@@ -0,0 +1,9 @@
+$(function() {
+    /* Interface to set view permissions from the explorer / editor */
+    $('a.action-set-view-permissions').click(function() {
+        ModalWorkflow({
+            'url': this.href
+        });
+        return false;
+    });
+});
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html
new file mode 100644
index 000000000..d8b652f32
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html
@@ -0,0 +1,8 @@
+{% load i18n %}
+{% trans "Access restricted" as title_str %}
+{% include "wagtailadmin/shared/header.html" with title=title_str %}
+
+<div class="nice-padding">
+    {% trans "Access to this page is restricted because it is within the section:" %}
+    <b>{{ page_with_restriction.title }}</b>
+</div>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
new file mode 100644
index 000000000..82e928c68
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
@@ -0,0 +1,7 @@
+{% load i18n %}
+{% trans "Set access restrictions" as title_str %}
+{% include "wagtailadmin/shared/header.html" with title=title_str %}
+
+<div class="nice-padding">
+    <p>form for setting access restrictions goes here</p>
+</div>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index 17bcbd8bf..f494f75ec 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -21,6 +21,7 @@
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-editor.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-chooser.js"></script>
     <script src="{{ STATIC_URL }}admin/js/urlify.js"></script>
+    <script src="{{ STATIC_URL }}wagtailadmin/js/view-permission-indicator.js"></script>
 
     {% hook_output 'insert_editor_js' %}
 {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
index 7f9c7d82b..030703aab 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
@@ -1,6 +1,21 @@
-{% load i18n %}
-{% if page.get_view_restrictions %}
-    <div>{% trans 'Private' %}</div>
-{% else %}
-    <div>{% trans 'Public' %}</div>
+{% load i18n wagtailadmin_tags %}
+
+{% if not page_perms %}
+    {% page_permissions page as page_perms %}
 {% endif %}
+
+{% with page.get_view_restrictions as has_view_restrictions %}
+    {% if has_view_restrictions %}
+        {% trans 'Private' as label %}
+    {% else %}
+        {% trans 'Public' as label %}
+    {% endif %}
+
+    {% if page_perms.can_set_view_restrictions %}
+        <div>
+            <a href="{% url 'wagtailadmin_pages_set_view_restrictions' page.id %}" class="button button-small action-set-view-permissions">{{ label }}</a>
+        </div>
+    {% else %}
+        <div>{{ label }}</div>
+    {% endif %}
+{% endwith %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
index e56ad170c..a1b108933 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
@@ -6,6 +6,7 @@
 {% block bodyclass %}menu-explorer  page-editor{% endblock %}
 
 {% block content %}
+    {% page_permissions page as page_perms %}
     <header class="merged tab-merged nice-padding">
         {% include "wagtailadmin/shared/breadcrumb.html" with page=page %}
 
@@ -17,7 +18,7 @@
                  {% trans "Status:" %} {% if page.live %}<a href="{{ page.url }}" class="status-tag {% if page.live %}primary{% endif %}">{{ page.status_string }}</a>{% else %}<span class="status-tag">{{ page.status_string }}</span>{% endif %}
             </div>
 
-            {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=page only %}
+            {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=page page_perms=page_perms only %}
 
         </div>
     </header>
@@ -25,8 +26,7 @@
     <form id="page-edit-form" action="{% url 'wagtailadmin_pages_edit' page.id %}" method="POST">
         {% csrf_token %}
         {{ edit_handler.render_form_content }}
-    
-        {% page_permissions page as page_perms %}
+
         <footer>
             <ul>
                 <li class="actions">
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
index c7190bb84..0f5c25f38 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
@@ -21,6 +21,10 @@
 {% endblock %}
 
 {% block extra_js %}
+    {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %}
+    <script src="{{ STATIC_URL }}wagtailadmin/js/modal-workflow.js"></script>
+    <script src="{{ STATIC_URL }}wagtailadmin/js/view-permission-indicator.js"></script>
+
     <script type="text/javascript">
         {% if ordering == 'ord' %}
             $(function() {
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 5fe32838e..a1d827c43 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -49,7 +49,7 @@
                             <h2>{{ parent_page.title }}</h2>
                         {% endif %}
 
-                        {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=parent_page only %}
+                        {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=parent_page page_perms=parent_page_perms only %}
 
                         <ul class="actions">
                             {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 89be5cf17..359250162 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import url
 
 from wagtail.wagtailadmin.forms import PasswordResetForm
-from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar
+from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar, page_view_restrictions
 from wagtail.wagtailcore import hooks
 
 
@@ -67,6 +67,8 @@ urlpatterns += [
     url(r'^pages/moderation/(\d+)/reject/$', pages.reject_moderation, name='wagtailadmin_pages_reject_moderation'),
     url(r'^pages/moderation/(\d+)/preview/$', pages.preview_for_moderation, name='wagtailadmin_pages_preview_for_moderation'),
 
+    url(r'^pages/(\d+)/view_restrictions/$', page_view_restrictions.set_view_restrictions, name='wagtailadmin_pages_set_view_restrictions'),
+
     url(r'^choose-page/$', chooser.browse, name='wagtailadmin_choose_page'),
     url(r'^choose-page/(\d+)/$', chooser.browse, name='wagtailadmin_choose_page_child'),
     url(r'^choose-external-link/$', chooser.external_link, name='wagtailadmin_choose_page_external_link'),
diff --git a/wagtail/wagtailadmin/views/page_view_restrictions.py b/wagtail/wagtailadmin/views/page_view_restrictions.py
new file mode 100644
index 000000000..4e2deab57
--- /dev/null
+++ b/wagtail/wagtailadmin/views/page_view_restrictions.py
@@ -0,0 +1,35 @@
+from django.core.exceptions import PermissionDenied
+from django.contrib.auth.decorators import permission_required
+from django.shortcuts import get_object_or_404
+
+from wagtail.wagtailcore.models import Page
+from wagtail.wagtailadmin.modal_workflow import render_modal_workflow
+
+@permission_required('wagtailadmin.access_admin')
+def set_view_restrictions(request, page_id):
+    page = get_object_or_404(Page, id=page_id)
+    page_perms = page.permissions_for_user(request.user)
+    if not page_perms.can_set_view_restrictions():
+        raise PermissionDenied
+
+    restrictions = page.get_view_restrictions().order_by('page__depth')
+    if restrictions:
+        if restrictions[0].page == page:
+            # a restriction is set on this specific page, and no restrictions
+            # further up the tree exist
+            return render_modal_workflow(
+                request, 'wagtailadmin/page_view_restrictions/set_view_restrictions.html', None, {}
+            )
+        else:
+            # a restriction further up the tree exists
+            return render_modal_workflow(
+                request, 'wagtailadmin/page_view_restrictions/ancestor_restriction.html', None,
+                {
+                    'page_with_restriction': restrictions[0].page,
+                }
+            )
+    else:
+        # no current view restrictions on this page
+        return render_modal_workflow(
+            request, 'wagtailadmin/page_view_restrictions/set_view_restrictions.html', None, {}
+        )
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 8670f0315..df88a8b22 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -1112,6 +1112,9 @@ class PagePermissionTester(object):
 
         return self.user.is_superuser or ('publish' in self.permissions)
 
+    def can_set_view_restrictions(self):
+        return self.can_publish()
+
     def can_publish_subpage(self):
         """
         Niggly special case for creating and publishing a page in one go.

From 1c313652eb55be048c3acfd378538b23cfd1bdeb Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 6 Jun 2014 15:23:57 +0100
Subject: [PATCH 070/154] implement form for setting access restrictions

---
 wagtail/wagtailadmin/forms.py                 |  8 ++
 .../set_view_restrictions.html                | 25 ++++++-
 .../set_view_restrictions.js                  | 19 +++++
 .../set_view_restrictions_done.js             |  3 +
 .../views/page_view_restrictions.py           | 74 ++++++++++++++-----
 5 files changed, 111 insertions(+), 18 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.js
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js

diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/wagtailadmin/forms.py
index e55a831f4..3878eb473 100644
--- a/wagtail/wagtailadmin/forms.py
+++ b/wagtail/wagtailadmin/forms.py
@@ -75,3 +75,11 @@ class PasswordResetForm(PasswordResetForm):
             raise forms.ValidationError(_("This email address is not recognised."))
 
         return cleaned_data
+
+
+class PageViewRestrictionForm(forms.Form):
+    restriction_type = forms.ChoiceField(choices=[
+        ('none', ugettext_lazy("This page is viewable by all visitors")),
+        ('password', ugettext_lazy("This page is only viewable to users who enter this password:")),
+    ], widget=forms.RadioSelect)
+    password = forms.CharField(required=False)
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
index 82e928c68..f3efa3699 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
@@ -3,5 +3,28 @@
 {% include "wagtailadmin/shared/header.html" with title=title_str %}
 
 <div class="nice-padding">
-    <p>form for setting access restrictions goes here</p>
+    <form action="{% url 'wagtailadmin_pages_set_view_restrictions' page.id %}" method="POST">
+        {% csrf_token %}
+        <ul>
+            <li>
+                {# 'This page is viewable by all visitors' #}
+                {{ form.restriction_type.0 }}
+            </li>
+            <li>
+                {# 'This page is only viewable to users who enter this password:' #}
+                {{ form.restriction_type.1 }}
+
+                {# FIXME: need distinct CSS styling for the 'disabled' state #}
+                {{ form.password }}
+                {% if form.password.errors %}
+                    <p class="error-message">
+                        {% for error in form.password.errors %}
+                            <span>{{ error }}</span>
+                        {% endfor %}
+                    </p>
+                {% endif %}
+            </li>
+        </ul>
+        <input type="submit" value="Set restriction">
+    </form>
 </div>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.js
new file mode 100644
index 000000000..0a40c0f85
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.js
@@ -0,0 +1,19 @@
+function(modal) {
+    $('form', modal.body).submit(function() {
+        modal.postForm(this.action, $(this).serialize());
+        return false;
+    });
+
+    var restrictionTypePasswordField = $("input[name='restriction_type'][value='password']", modal.body);
+    var passwordField = $("#id_password", modal.body);
+    function refreshFormFields() {
+        if (restrictionTypePasswordField.is(':checked')) {
+            passwordField.removeAttr('disabled');
+        } else {
+            passwordField.attr('disabled', true);
+        }
+    }
+    refreshFormFields();
+
+    $("input[name='restriction_type']", modal.body).change(refreshFormFields);
+}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js
new file mode 100644
index 000000000..3ccc7e057
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js
@@ -0,0 +1,3 @@
+function(modal) {
+    modal.close();
+}
diff --git a/wagtail/wagtailadmin/views/page_view_restrictions.py b/wagtail/wagtailadmin/views/page_view_restrictions.py
index 4e2deab57..481ad9ae8 100644
--- a/wagtail/wagtailadmin/views/page_view_restrictions.py
+++ b/wagtail/wagtailadmin/views/page_view_restrictions.py
@@ -2,7 +2,8 @@ from django.core.exceptions import PermissionDenied
 from django.contrib.auth.decorators import permission_required
 from django.shortcuts import get_object_or_404
 
-from wagtail.wagtailcore.models import Page
+from wagtail.wagtailcore.models import Page, PageViewRestriction
+from wagtail.wagtailadmin.forms import PageViewRestrictionForm
 from wagtail.wagtailadmin.modal_workflow import render_modal_workflow
 
 @permission_required('wagtailadmin.access_admin')
@@ -12,24 +13,63 @@ def set_view_restrictions(request, page_id):
     if not page_perms.can_set_view_restrictions():
         raise PermissionDenied
 
+    # fetch restriction records in depth order so that ancestors appear first
     restrictions = page.get_view_restrictions().order_by('page__depth')
     if restrictions:
-        if restrictions[0].page == page:
-            # a restriction is set on this specific page, and no restrictions
-            # further up the tree exist
-            return render_modal_workflow(
-                request, 'wagtailadmin/page_view_restrictions/set_view_restrictions.html', None, {}
-            )
-        else:
-            # a restriction further up the tree exists
-            return render_modal_workflow(
-                request, 'wagtailadmin/page_view_restrictions/ancestor_restriction.html', None,
-                {
-                    'page_with_restriction': restrictions[0].page,
-                }
-            )
+        restriction = restrictions[0]
+        restriction_exists_on_ancestor = (restriction.page != page)
     else:
-        # no current view restrictions on this page
+        restriction = None
+        restriction_exists_on_ancestor = False
+
+    if request.POST:
+        form = PageViewRestrictionForm(request.POST)
+        if form.is_valid() and not restriction_exists_on_ancestor:
+            if form.cleaned_data['restriction_type'] == 'none':
+                # remove any existing restriction
+                if restriction:
+                    restriction.delete()
+            else:  # restriction_type = 'password'
+                if restriction:
+                    restriction.password = form.cleaned_data['password']
+                    restriction.save()
+                else:
+                    # create a new restriction object
+                    PageViewRestriction.objects.create(
+                        page=page, password = form.cleaned_data['password'])
+
+            return render_modal_workflow(
+                request, None, 'wagtailadmin/page_view_restrictions/set_view_restrictions_done.js'
+            )
+
+    else:  # request is a GET
+        if not restriction_exists_on_ancestor:
+            if restriction:
+                form = PageViewRestrictionForm(initial={
+                    'restriction_type': 'password', 'password': restriction.password
+                })
+            else:
+                # no current view restrictions on this page
+                form = PageViewRestrictionForm(initial={
+                    'restriction_type': 'none'
+                })
+
+    if restriction_exists_on_ancestor:
+        # display a message indicating that there is a restriction at ancestor level -
+        # do not provide the form for setting up new restrictions
         return render_modal_workflow(
-            request, 'wagtailadmin/page_view_restrictions/set_view_restrictions.html', None, {}
+            request, 'wagtailadmin/page_view_restrictions/ancestor_restriction.html', None,
+            {
+                'page_with_restriction': restriction.page,
+            }
+        )
+    else:
+        # no restriction set at ancestor level - can set restrictions here
+        return render_modal_workflow(
+            request,
+            'wagtailadmin/page_view_restrictions/set_view_restrictions.html',
+            'wagtailadmin/page_view_restrictions/set_view_restrictions.js', {
+                'page': page,
+                'form': form,
+            }
         )

From 0fbd3e7e14bdc594e1eaef3ea948101fed039ef4 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 6 Jun 2014 16:34:42 +0100
Subject: [PATCH 071/154] make view permission indicator update dynamically
 after permissions are set

---
 .../js/view-permission-indicator.js           | 11 +++++++++-
 .../components/view-permission-indicator.scss |  8 +++++++
 .../set_view_restrictions_done.js             |  1 +
 .../wagtailadmin/pages/_editor_css.html       |  1 +
 .../pages/_view_permission_indicator.html     | 21 +++++++++++--------
 .../templates/wagtailadmin/pages/index.html   |  9 ++++++--
 .../views/page_view_restrictions.py           |  4 +++-
 7 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js
index 52b7442a7..5e84e0840 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js
@@ -2,7 +2,16 @@ $(function() {
     /* Interface to set view permissions from the explorer / editor */
     $('a.action-set-view-permissions').click(function() {
         ModalWorkflow({
-            'url': this.href
+            'url': this.href,
+            'responses': {
+                'setPermission': function(isPublic) {
+                    if (isPublic) {
+                        $('.view-permission-indicator').removeClass('private').addClass('public');
+                    } else {
+                        $('.view-permission-indicator').removeClass('public').addClass('private');
+                    }
+                }
+            }
         });
         return false;
     });
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss
new file mode 100644
index 000000000..8e26eaf74
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss
@@ -0,0 +1,8 @@
+.view-permission-indicator {
+    &.public {
+        .label-private { display: none; }
+    }
+    &.private {
+        .label-public { display: none; }
+    }
+}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js
index 3ccc7e057..dafbc7b36 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js
@@ -1,3 +1,4 @@
 function(modal) {
+    modal.respond('setPermission', {% if is_public %}true{% else %}false{% endif %});
     modal.close();
 }
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
index 2e140c89c..58d7d5f17 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
@@ -7,6 +7,7 @@
 {% compress css %}
     <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/layouts/page-editor.scss" type="text/x-scss" />
     <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/panels/rich-text.scss" type="text/x-scss" />
+    <link rel="stylesheet" type="text/x-scss" href="{{ STATIC_URL }}wagtailadmin/scss/components/view-permission-indicator.scss">
 
     {# we'll want tag-it included, for the benefit of any modals that use it, like images. #}
     {# TODO: a method of injecting these sorts of things on demand when the modal is spawned #}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
index 030703aab..ee6a7e3b4 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
@@ -5,17 +5,20 @@
 {% endif %}
 
 {% with page.get_view_restrictions as has_view_restrictions %}
-    {% if has_view_restrictions %}
-        {% trans 'Private' as label %}
-    {% else %}
-        {% trans 'Public' as label %}
-    {% endif %}
-
     {% if page_perms.can_set_view_restrictions %}
-        <div>
-            <a href="{% url 'wagtailadmin_pages_set_view_restrictions' page.id %}" class="button button-small action-set-view-permissions">{{ label }}</a>
+        <div class="view-permission-indicator {% if has_view_restrictions %}private{% else %}public{% endif %}">
+            <a href="{% url 'wagtailadmin_pages_set_view_restrictions' page.id %}" class="button button-small action-set-view-permissions">
+                {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
+                <span class="label-public">{% trans 'Public' %}</span>
+                <span class="label-private">{% trans 'Private' %}</span>
+            </a>
         </div>
     {% else %}
-        <div>{{ label }}</div>
+        {# Read-only display, for users who don't have permission to set view restrictions #}
+        {% if has_view_restrictions %}
+            <div class="view-permission-indicator private"><span class="label-private">{% trans 'Private' %}</span></div>
+        {% else %}
+            <div class="view-permission-indicator public"><span class="label-public">{% trans 'Public' %}</span></div>
+        {% endif %}
     {% endif %}
 {% endwith %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
index 0f5c25f38..e9e4847dd 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
@@ -1,6 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load i18n %}
-{% load wagtailadmin_tags %}
+{% load i18n wagtailadmin_tags compress %}
 {% block titletag %}{% blocktrans with title=parent_page.title %}Exploring {{ title }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}menu-explorer page-explorer {% if ordering == 'ord' %}reordering{% endif %}{% endblock %}
 
@@ -20,6 +19,12 @@
 
 {% endblock %}
 
+{% block extra_css %}
+    {% compress css %}
+        <link rel="stylesheet" type="text/x-scss" href="{{ STATIC_URL }}wagtailadmin/scss/components/view-permission-indicator.scss">
+    {% endcompress %}
+{% endblock %}
+
 {% block extra_js %}
     {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %}
     <script src="{{ STATIC_URL }}wagtailadmin/js/modal-workflow.js"></script>
diff --git a/wagtail/wagtailadmin/views/page_view_restrictions.py b/wagtail/wagtailadmin/views/page_view_restrictions.py
index 481ad9ae8..e36e9900d 100644
--- a/wagtail/wagtailadmin/views/page_view_restrictions.py
+++ b/wagtail/wagtailadmin/views/page_view_restrictions.py
@@ -39,7 +39,9 @@ def set_view_restrictions(request, page_id):
                         page=page, password = form.cleaned_data['password'])
 
             return render_modal_workflow(
-                request, None, 'wagtailadmin/page_view_restrictions/set_view_restrictions_done.js'
+                request, None, 'wagtailadmin/page_view_restrictions/set_view_restrictions_done.js', {
+                    'is_public': (form.cleaned_data['restriction_type'] == 'none')
+                }
             )
 
     else:  # request is a GET

From 47c0a197c8392bb216ff4e30bb6ea648e423ab96 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 6 Jun 2014 16:53:25 +0100
Subject: [PATCH 072/154] make password a required field when restriction_type
 = password

---
 wagtail/wagtailadmin/forms.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/wagtailadmin/forms.py
index 3878eb473..f3634faf0 100644
--- a/wagtail/wagtailadmin/forms.py
+++ b/wagtail/wagtailadmin/forms.py
@@ -83,3 +83,12 @@ class PageViewRestrictionForm(forms.Form):
         ('password', ugettext_lazy("This page is only viewable to users who enter this password:")),
     ], widget=forms.RadioSelect)
     password = forms.CharField(required=False)
+
+    def clean(self):
+        cleaned_data = super(PageViewRestrictionForm, self).clean()
+
+        if cleaned_data.get('restriction_type') == 'password' and not cleaned_data.get('password'):
+            self._errors["password"] = self.error_class([_('This field is required.')])
+            del cleaned_data['password']
+
+        return cleaned_data

From 9f460bff05176a3cebe2b5fea04b9419d63880b1 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 6 Jun 2014 17:09:12 +0100
Subject: [PATCH 073/154] move check_view_restrictions into the Page model, so
 that sites with non-standard routing requirements can use it independently of
 the before_serve_page hook

---
 wagtail/wagtailcore/models.py        | 24 ++++++++++++++++++++++--
 wagtail/wagtailcore/wagtail_hooks.py | 15 +--------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index df88a8b22..c6cb095a1 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -9,12 +9,11 @@ from modelcluster.models import ClusterableModel
 
 from django.db import models, connection, transaction
 from django.db.models import get_model, Q
-from django.db.models.signals import post_save
-from django.dispatch import receiver
 from django.http import Http404
 from django.core.cache import cache
 from django.core.handlers.wsgi import WSGIRequest
 from django.core.handlers.base import BaseHandler
+from django.core.urlresolvers import reverse
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import Group
 from django.conf import settings
@@ -812,8 +811,29 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
         return self.get_siblings(inclusive).filter(path__lte=self.path).order_by('-path')
 
     def get_view_restrictions(self):
+        """Return a query set of all page view restrictions that apply to this page"""
         return PageViewRestriction.objects.filter(page__in=self.get_ancestors(inclusive=True))
 
+    def check_view_restrictions(self, request):
+        """
+        Check whether there are any view restrictions on this page which are
+        not fulfilled by the given request object. If there are, return an
+        HttpResponse that will notify the user of that restriction (and possibly
+        include a password / login form that will allow them to proceed). If
+        there are no such restrictions, return None
+        """
+        restrictions = self.get_view_restrictions()
+
+        if restrictions:
+            passed_restrictions = request.session.get('passed_page_view_restrictions', [])
+            for restriction in restrictions:
+                if restriction.id not in passed_restrictions:
+                    from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm
+                    form = PasswordPageViewRestrictionForm(instance=restriction,
+                        initial={'return_url': request.get_full_path()})
+                    action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, self.id])
+                    return self.serve_password_required_response(request, form, action_url)
+
     password_required_template = getattr(settings, 'PASSWORD_REQUIRED_TEMPLATE', 'wagtailcore/password_required.html')
     def serve_password_required_response(self, request, form, action_url):
         """
diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py
index e92971c99..3763c881b 100644
--- a/wagtail/wagtailcore/wagtail_hooks.py
+++ b/wagtail/wagtailcore/wagtail_hooks.py
@@ -1,18 +1,5 @@
-from django.core.urlresolvers import reverse
-
 from wagtail.wagtailcore import hooks
-from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm
 
 def check_view_restrictions(page, request):
-    restrictions = page.get_view_restrictions()
-
-    if restrictions:
-        passed_restrictions = request.session.get('passed_page_view_restrictions', [])
-        for restriction in restrictions:
-            if restriction.id not in passed_restrictions:
-                form = PasswordPageViewRestrictionForm(instance=restriction,
-                    initial={'return_url': request.get_full_path()})
-                action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id])
-                return page.serve_password_required_response(request, form, action_url)
-
+    return page.check_view_restrictions(request)
 hooks.register('before_serve_page', check_view_restrictions)

From 1ee707f4052a8e0b26823918e423b1ca43087bc6 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 6 Jun 2014 17:15:50 +0100
Subject: [PATCH 074/154] Add note that access restrictions will take effect on
 child pages

---
 .../page_view_restrictions/set_view_restrictions.html            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
index f3efa3699..632c34f1b 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
@@ -27,4 +27,5 @@
         </ul>
         <input type="submit" value="Set restriction">
     </form>
+    <p>{% trans "Access restrictions will take effect on this page and all child pages." %}</p>
 </div>

From 9e94c83843c2feeec597a2a8b65b8e061f6812f8 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Mon, 9 Jun 2014 14:08:39 +0100
Subject: [PATCH 075/154] Add 'private' indicator in page chooser for pages
 with view restrictions

---
 .../pages/_view_permission_indicator.html     | 31 +++++++++----------
 .../templates/wagtailadmin/pages/list.html    | 10 ++++++
 .../templatetags/wagtailadmin_tags.py         | 22 ++++++++++++-
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
index ee6a7e3b4..5bb8853e0 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
@@ -1,24 +1,23 @@
 {% load i18n wagtailadmin_tags %}
 
+{% test_page_is_public page as is_public %}
 {% if not page_perms %}
     {% page_permissions page as page_perms %}
 {% endif %}
 
-{% with page.get_view_restrictions as has_view_restrictions %}
-    {% if page_perms.can_set_view_restrictions %}
-        <div class="view-permission-indicator {% if has_view_restrictions %}private{% else %}public{% endif %}">
-            <a href="{% url 'wagtailadmin_pages_set_view_restrictions' page.id %}" class="button button-small action-set-view-permissions">
-                {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
-                <span class="label-public">{% trans 'Public' %}</span>
-                <span class="label-private">{% trans 'Private' %}</span>
-            </a>
-        </div>
+{% if page_perms.can_set_view_restrictions %}
+    <div class="view-permission-indicator {% if is_public %}public{% else %}private{% endif %}">
+        <a href="{% url 'wagtailadmin_pages_set_view_restrictions' page.id %}" class="button button-small action-set-view-permissions">
+            {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
+            <span class="label-public">{% trans 'Public' %}</span>
+            <span class="label-private">{% trans 'Private' %}</span>
+        </a>
+    </div>
+{% else %}
+    {# Read-only display, for users who don't have permission to set view restrictions #}
+    {% if is_public %}
+        <div class="view-permission-indicator public"><span class="label-public">{% trans 'Public' %}</span></div>
     {% else %}
-        {# Read-only display, for users who don't have permission to set view restrictions #}
-        {% if has_view_restrictions %}
-            <div class="view-permission-indicator private"><span class="label-private">{% trans 'Private' %}</span></div>
-        {% else %}
-            <div class="view-permission-indicator public"><span class="label-public">{% trans 'Public' %}</span></div>
-        {% endif %}
+        <div class="view-permission-indicator private"><span class="label-private">{% trans 'Private' %}</span></div>
     {% endif %}
-{% endwith %}
+{% endif %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index a1d827c43..44b058e83 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -42,6 +42,11 @@
                         {% else %}
                             <h2>{{ parent_page.title }}</h2>
                         {% endif %}
+
+                        {% test_page_is_public parent_page as is_public %}
+                        {% if not is_public %}
+                            <em>(private)</em>
+                        {% endif %}
                     {% else %}
                         {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
                             <h2><a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}">{{ parent_page.title }}</a></h2>
@@ -155,6 +160,11 @@
                                 {% else %}
                                     {{ page.title }}
                                 {% endif %}
+
+                                {% test_page_is_public page as is_public %}
+                                {% if not is_public %}
+                                    <em>(private)</em>
+                                {% endif %}
                             {% else %}
                                 {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
                                     <a href="{% url 'wagtailadmin_pages_edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a>
diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
index f3c871507..a6467532d 100644
--- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
+++ b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
@@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _
 from wagtail.wagtailadmin.menu import MenuItem
 
 from wagtail.wagtailcore import hooks
-from wagtail.wagtailcore.models import get_navigation_menu_items, UserPagePermissionsProxy
+from wagtail.wagtailcore.models import get_navigation_menu_items, UserPagePermissionsProxy, PageViewRestriction
 from wagtail.wagtailcore.utils import camelcase_to_underscore
 
 
@@ -88,6 +88,26 @@ def page_permissions(context, page):
     return context['user_page_permissions'].for_page(page)
 
 
+@register.assignment_tag(takes_context=True)
+def test_page_is_public(context, page):
+    """
+    Usage: {% test_page_is_public page as is_public %}
+    Sets 'is_public' to True iff there are no page view restrictions in place on
+    this page.
+    Caches the list of page view restrictions in the context, to avoid repeated
+    DB queries on repeated calls.
+    """
+    if 'all_page_view_restriction_paths' not in context:
+        context['all_page_view_restriction_paths'] = PageViewRestriction.objects.select_related('page').values_list('page__path', flat=True)
+
+    is_private = any([
+        page.path.startswith(restricted_path)
+        for restricted_path in context['all_page_view_restriction_paths']
+    ])
+
+    return not is_private
+
+
 @register.simple_tag
 def hook_output(hook_name):
     """

From ff33a00deb035063c2ff0809a4dea2eb3d48902e Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Tue, 10 Jun 2014 14:33:08 +0100
Subject: [PATCH 076/154] 'view restrictions' renamed 'privacy' and general
 wagtail styling of privacy status completed

---
 wagtail/wagtailadmin/forms.py                 |  6 +-
 .../wagtailadmin/js/privacy-indicator.js      | 18 +++++
 .../js/view-permission-indicator.js           | 18 -----
 .../scss/components/formatters.scss           | 19 +++++-
 .../wagtailadmin/scss/components/forms.scss   |  6 ++
 .../wagtailadmin/scss/components/header.scss  | 10 ++-
 .../wagtailadmin/scss/components/listing.scss |  5 ++
 .../components/view-permission-indicator.scss |  8 ---
 .../static/wagtailadmin/scss/normalize.css    |  9 ---
 .../page_privacy/ancestor_privacy.html        |  8 +++
 .../page_privacy/set_privacy.html             | 16 +++++
 .../set_privacy.js}                           |  0
 .../set_privacy_done.js}                      |  0
 .../ancestor_restriction.html                 |  8 ---
 .../set_view_restrictions.html                | 31 ---------
 .../wagtailadmin/pages/_editor_css.html       |  1 -
 .../wagtailadmin/pages/_editor_js.html        |  2 +-
 .../pages/_privacy_indicator.html             | 23 +++++++
 .../pages/_view_permission_indicator.html     | 23 -------
 .../templates/wagtailadmin/pages/edit.html    | 12 ++--
 .../templates/wagtailadmin/pages/index.html   |  9 +--
 .../templates/wagtailadmin/pages/list.html    | 65 ++++++++++++-------
 .../templatetags/wagtailadmin_tags.py         |  5 +-
 wagtail/wagtailadmin/urls.py                  |  4 +-
 ...e_view_restrictions.py => page_privacy.py} | 10 +--
 25 files changed, 161 insertions(+), 155 deletions(-)
 create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js
 delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html
 rename wagtail/wagtailadmin/templates/wagtailadmin/{page_view_restrictions/set_view_restrictions.js => page_privacy/set_privacy.js} (100%)
 rename wagtail/wagtailadmin/templates/wagtailadmin/{page_view_restrictions/set_view_restrictions_done.js => page_privacy/set_privacy_done.js} (100%)
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
 rename wagtail/wagtailadmin/views/{page_view_restrictions.py => page_privacy.py} (87%)

diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/wagtailadmin/forms.py
index f3634faf0..e9b10f63c 100644
--- a/wagtail/wagtailadmin/forms.py
+++ b/wagtail/wagtailadmin/forms.py
@@ -78,9 +78,9 @@ class PasswordResetForm(PasswordResetForm):
 
 
 class PageViewRestrictionForm(forms.Form):
-    restriction_type = forms.ChoiceField(choices=[
-        ('none', ugettext_lazy("This page is viewable by all visitors")),
-        ('password', ugettext_lazy("This page is only viewable to users who enter this password:")),
+    restriction_type = forms.ChoiceField(label="Visibility", choices=[
+        ('none', ugettext_lazy("Public")),
+        ('password', ugettext_lazy("Private, accessible with the following password")),
     ], widget=forms.RadioSelect)
     password = forms.CharField(required=False)
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js
new file mode 100644
index 000000000..eb280f00e
--- /dev/null
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js
@@ -0,0 +1,18 @@
+$(function() {
+    /* Interface to set permissions from the explorer / editor */
+    $('a.action-set-privacy').click(function() {
+        ModalWorkflow({
+            'url': this.href,
+            'responses': {
+                'setPermission': function(isPublic) {
+                    if (isPublic) {
+                        $('.privacy-indicator').removeClass('private').addClass('public');
+                    } else {
+                        $('.privacy-indicator').removeClass('public').addClass('private');
+                    }
+                }
+            }
+        });
+        return false;
+    });
+});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js
deleted file mode 100644
index 5e84e0840..000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js
+++ /dev/null
@@ -1,18 +0,0 @@
-$(function() {
-    /* Interface to set view permissions from the explorer / editor */
-    $('a.action-set-view-permissions').click(function() {
-        ModalWorkflow({
-            'url': this.href,
-            'responses': {
-                'setPermission': function(isPublic) {
-                    if (isPublic) {
-                        $('.view-permission-indicator').removeClass('private').addClass('public');
-                    } else {
-                        $('.view-permission-indicator').removeClass('public').addClass('private');
-                    }
-                }
-            }
-        });
-        return false;
-    });
-});
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
index 97e915f36..b88c4fd60 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
@@ -121,8 +121,8 @@
     color:lighten($color-grey-2,30%);
     -webkit-font-smoothing: auto;
     font-size:0.80em;
-    margin:0 0.5em;
-    background:white url("#{$static-root}bg-dark-diag.svg");
+    margin:0 0.5em 0.5em;
+    background:white url(   "#{$static-root}bg-dark-diag.svg");
 
     &.primary{
         color:$color-grey-2;
@@ -136,6 +136,20 @@ a.status-tag.primary:hover{
     color:$color-teal;
 }
 
+.privacy-indicator {
+    &.public {
+        .label-private { 
+            display: none;
+        }
+    }
+    &.private {
+        .label-public {
+            display: none;
+        }
+    }
+}
+
+
 /* free tagging tags from taggit */
 .tag{
     background-color:$color-teal;
@@ -174,6 +188,7 @@ a.tag:hover{
     }
 }
 
+
 /* make a block-level element inline */
 .inline{
     display:inline;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 3a8f67ba2..d71ff66da 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -69,6 +69,10 @@ input, textarea, select, .richtext, .tagit{
         outline:none;
         background-color:$color-input-focus;
     }
+    &:disabled, &[disabled], &:disabled:hover, &[disabled]:hover{
+        background-color:inherit;
+        cursor:not-allowed;
+    }  
 }
 
 /* select boxes */
@@ -135,6 +139,7 @@ input[type=radio]:before{
     display:block;
     content:"K";
     width: 1em;
+    height:1em;
     line-height: 1.1em;
     padding: 4px;
     background-color: white;
@@ -741,6 +746,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
         .choice_field &,
         .model_multiple_choice_field &,
         .boolean_field &,
+        .choice_field &,
         .model_choice_field &,
         .image_field &,
         .file_field &{
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
index 3f079897f..1e9905d27 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss
@@ -5,6 +5,10 @@ header{
     margin-bottom:2em;
     color:white;
 
+    a{
+        color:white;
+    }
+
     h1, h2{
         margin:0;
         color:white;
@@ -97,12 +101,6 @@ header{
     }
 }
 
-.page-explorer header{
-    margin-bottom:0;
-    padding-bottom:0em;
-}
-
-
 @media screen and (min-width: $breakpoint-mobile){
     header{
         padding-top:1.5em;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index 9d940362a..8a5baa8d3 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -379,6 +379,11 @@ table.listing{
         }
     }
 
+    .privacy-indicator{
+        font-size:0.9em;
+        opacity:0.7;
+    }
+
     .table-headers{
         .ord{
             padding-right:0;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss
deleted file mode 100644
index 8e26eaf74..000000000
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.view-permission-indicator {
-    &.public {
-        .label-private { display: none; }
-    }
-    &.private {
-        .label-public { display: none; }
-    }
-}
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css
index 8d57e3c96..8d945b3ec 100755
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css
@@ -452,15 +452,6 @@ input[type="submit"] {
     *overflow: visible;  /* 4 */
 }
 
-/**
- * Re-set default cursor for disabled elements.
- */
-
-button[disabled],
-html input[disabled] {
-    cursor: default;
-}
-
 /**
  * 1. Address box sizing set to content-box in IE 8/9.
  * 2. Remove excess padding in IE 8/9.
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html
new file mode 100644
index 000000000..b1471ba25
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html
@@ -0,0 +1,8 @@
+{% load i18n %}
+{% trans "Page privacy" as title_str %}
+{% include "wagtailadmin/shared/header.html" with title=title_str icon="locked" %}
+
+<div class="nice-padding">
+    <p>{% trans "This page has been made private by a parent page." %}</p>
+    <p>{% trans "You can edit the privacy settings on:" %} <a href="{% url 'wagtailadmin_pages_edit' page_with_restriction.id %}">{{ page_with_restriction.title }}</a>
+</div>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html
new file mode 100644
index 000000000..6298d6f5f
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html
@@ -0,0 +1,16 @@
+{% load i18n %}
+{% trans "Page privacy" as title_str %}
+{% include "wagtailadmin/shared/header.html" with title=title_str icon="locked" %}
+
+<div class="nice-padding">
+    <p>{% trans "<b>Note:</b> privacy changes apply to all children of this page too." %}</p>
+    <form action="{% url 'wagtailadmin_pages_set_privacy' page.id %}" method="POST">
+        {% csrf_token %}
+        <ul class="fields">
+            {% include "wagtailadmin/shared/field_as_li.html" with field=form.restriction_type %}
+            {% include "wagtailadmin/shared/field_as_li.html" with field=form.password li_classes="password-field" %}
+        </ul>
+        <input type="submit" value="Save" />
+    </form>
+    
+</div>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js
similarity index 100%
rename from wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.js
rename to wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js
similarity index 100%
rename from wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js
rename to wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html
deleted file mode 100644
index d8b652f32..000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% load i18n %}
-{% trans "Access restricted" as title_str %}
-{% include "wagtailadmin/shared/header.html" with title=title_str %}
-
-<div class="nice-padding">
-    {% trans "Access to this page is restricted because it is within the section:" %}
-    <b>{{ page_with_restriction.title }}</b>
-</div>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
deleted file mode 100644
index 632c34f1b..000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% load i18n %}
-{% trans "Set access restrictions" as title_str %}
-{% include "wagtailadmin/shared/header.html" with title=title_str %}
-
-<div class="nice-padding">
-    <form action="{% url 'wagtailadmin_pages_set_view_restrictions' page.id %}" method="POST">
-        {% csrf_token %}
-        <ul>
-            <li>
-                {# 'This page is viewable by all visitors' #}
-                {{ form.restriction_type.0 }}
-            </li>
-            <li>
-                {# 'This page is only viewable to users who enter this password:' #}
-                {{ form.restriction_type.1 }}
-
-                {# FIXME: need distinct CSS styling for the 'disabled' state #}
-                {{ form.password }}
-                {% if form.password.errors %}
-                    <p class="error-message">
-                        {% for error in form.password.errors %}
-                            <span>{{ error }}</span>
-                        {% endfor %}
-                    </p>
-                {% endif %}
-            </li>
-        </ul>
-        <input type="submit" value="Set restriction">
-    </form>
-    <p>{% trans "Access restrictions will take effect on this page and all child pages." %}</p>
-</div>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
index 58d7d5f17..2e140c89c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html
@@ -7,7 +7,6 @@
 {% compress css %}
     <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/layouts/page-editor.scss" type="text/x-scss" />
     <link rel="stylesheet" href="{{ STATIC_URL }}wagtailadmin/scss/panels/rich-text.scss" type="text/x-scss" />
-    <link rel="stylesheet" type="text/x-scss" href="{{ STATIC_URL }}wagtailadmin/scss/components/view-permission-indicator.scss">
 
     {# we'll want tag-it included, for the benefit of any modals that use it, like images. #}
     {# TODO: a method of injecting these sorts of things on demand when the modal is spawned #}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index f494f75ec..a3185e096 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -21,7 +21,7 @@
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-editor.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-chooser.js"></script>
     <script src="{{ STATIC_URL }}admin/js/urlify.js"></script>
-    <script src="{{ STATIC_URL }}wagtailadmin/js/view-permission-indicator.js"></script>
+    <script src="{{ STATIC_URL }}wagtailadmin/js/privacy-indicator.js"></script>
 
     {% hook_output 'insert_editor_js' %}
 {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html
new file mode 100644
index 000000000..53aa44800
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html
@@ -0,0 +1,23 @@
+{% load i18n wagtailadmin_tags %}
+
+{% test_page_is_public page as is_public %}
+{% if not page_perms %}
+    {% page_permissions page as page_perms %}
+{% endif %}
+
+<div class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
+    {% trans "Privacy" %}
+    {% if page_perms.can_set_view_restrictions %}
+        <a href="{% url 'wagtailadmin_pages_set_privacy' page.id %}" class="status-tag primary  action-set-privacy">
+            {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
+            <span class="label-public icon icon-unlocked">{% trans 'Public' %}</span>
+            <span class="label-private icon icon-locked">{% trans 'Private' %}</span>
+        </a>
+    {% else %}
+        {% if is_public %}
+            <span class="label-public status-tag primary icon icon-unlocked ">{% trans 'Public' %}</span>
+        {% else %}
+            <span class="label-private status-tag primary icon icon-locked">{% trans 'Private' %}</span>
+        {% endif %}
+    {% endif %}
+</div>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
deleted file mode 100644
index 5bb8853e0..000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% load i18n wagtailadmin_tags %}
-
-{% test_page_is_public page as is_public %}
-{% if not page_perms %}
-    {% page_permissions page as page_perms %}
-{% endif %}
-
-{% if page_perms.can_set_view_restrictions %}
-    <div class="view-permission-indicator {% if is_public %}public{% else %}private{% endif %}">
-        <a href="{% url 'wagtailadmin_pages_set_view_restrictions' page.id %}" class="button button-small action-set-view-permissions">
-            {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
-            <span class="label-public">{% trans 'Public' %}</span>
-            <span class="label-private">{% trans 'Private' %}</span>
-        </a>
-    </div>
-{% else %}
-    {# Read-only display, for users who don't have permission to set view restrictions #}
-    {% if is_public %}
-        <div class="view-permission-indicator public"><span class="label-public">{% trans 'Public' %}</span></div>
-    {% else %}
-        <div class="view-permission-indicator private"><span class="label-private">{% trans 'Private' %}</span></div>
-    {% endif %}
-{% endif %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
index a1b108933..c15efbd59 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
@@ -15,11 +15,15 @@
                 <h1 class="icon icon-doc-empty-inverse">{% blocktrans with title=page.title %}Editing <span>{{ title }}</span>{% endblocktrans %}</h1>
             </div>
             <div class="right col3">
-                 {% trans "Status:" %} {% if page.live %}<a href="{{ page.url }}" class="status-tag {% if page.live %}primary{% endif %}">{{ page.status_string }}</a>{% else %}<span class="status-tag">{{ page.status_string }}</span>{% endif %}
+                {% trans "Status" %}
+                {% if page.live %}
+                    <a href="{{ page.url }}" class="status-tag {% if page.live %}primary{% endif %}">{{ page.status_string }}</a>
+                {% else %}
+                    <span class="status-tag">{{ page.status_string }}</span>
+                {% endif %}
+
+                {% include "wagtailadmin/pages/_privacy_indicator.html" with page=page page_perms=page_perms only %}
             </div>
-
-            {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=page page_perms=page_perms only %}
-
         </div>
     </header>
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
index e9e4847dd..3a3aa49a7 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
@@ -16,19 +16,12 @@
         {% page_permissions parent_page as parent_page_perms %}
         {% include "wagtailadmin/pages/list.html" with sortable=1 allow_navigation=1 full_width=1 parent_page=parent_page orderable=parent_page_perms.can_reorder_children %} 
     </form>
-
-{% endblock %}
-
-{% block extra_css %}
-    {% compress css %}
-        <link rel="stylesheet" type="text/x-scss" href="{{ STATIC_URL }}wagtailadmin/scss/components/view-permission-indicator.scss">
-    {% endcompress %}
 {% endblock %}
 
 {% block extra_js %}
     {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %}
     <script src="{{ STATIC_URL }}wagtailadmin/js/modal-workflow.js"></script>
-    <script src="{{ STATIC_URL }}wagtailadmin/js/view-permission-indicator.js"></script>
+    <script src="{{ STATIC_URL }}wagtailadmin/js/privacy-indicator.js"></script>
 
     <script type="text/javascript">
         {% if ordering == 'ord' %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 44b058e83..9e252e198 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -31,30 +31,45 @@
             <tr class="index {% if not parent_page.live %} inactive{% endif %} {% if moving or choosing %}{% if parent_page.can_choose %}can-choose{% endif %}{% endif %}">
                 <td class="title" {% if orderable %}colspan="2"{% endif %}>
                     {% if moving %}
-                        {% if parent_page.can_choose %}
-                            <h2><a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id parent_page.id %}">{{ parent_page.title }}</a></h2>
-                        {% else %}
-                            <h2>{{ parent_page.title }}</h2>
-                        {% endif %}
+                        <h2>
+                            {% if parent_page.can_choose %}
+                                <a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id parent_page.id %}">{{ parent_page.title }}</a><
+                            {% else %}
+                                {{ parent_page.title }}
+                            {% endif %}
+
+                            {% test_page_is_public parent_page as is_public %}
+                            {% if not is_public %}
+                                <span class="privacy-indicator icon icon-locked" title="This page is protected from public view"></span>
+                            {% endif %}
+                        </h2>
                     {% elif choosing %}
-                        {% if parent_page.can_choose %}
-                            <h2><a class="choose-page" href="#{{ parent_page.id }}" data-id="{{ parent_page.id }}" data-title="{{ parent_page.title }}" data-url="{{ parent_page.url }}">{{ parent_page.title }}</a></h2>
-                        {% else %}
-                            <h2>{{ parent_page.title }}</h2>
-                        {% endif %}
+                        <h2>
+                            {% if parent_page.can_choose %}
+                                <a class="choose-page" href="#{{ parent_page.id }}" data-id="{{ parent_page.id }}" data-title="{{ parent_page.title }}" data-url="{{ parent_page.url }}">{{ parent_page.title }}</a>
+                            {% else %}
+                                {{ parent_page.title }}
+                            {% endif %}
 
-                        {% test_page_is_public parent_page as is_public %}
-                        {% if not is_public %}
-                            <em>(private)</em>
-                        {% endif %}
+                            {% test_page_is_public parent_page as is_public %}
+                            {% if not is_public %}
+                                <span class="privacy-indicator icon icon-locked" title="This page is protected from public view"></span>
+                            {% endif %}
+                        </h2>
                     {% else %}
-                        {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
-                            <h2><a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}">{{ parent_page.title }}</a></h2>
-                        {% else %}
-                            <h2>{{ parent_page.title }}</h2>
-                        {% endif %}
+                        <h2>
+                            {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
+                                <a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}">{{ parent_page.title }}</a>
+                            {% else %}
+                                    {{ parent_page.title }}
+                            {% endif %}
 
-                        {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=parent_page page_perms=parent_page_perms only %}
+                            {% test_page_is_public parent_page as is_public %}
+                            {% if not is_public %}
+                                <span class="privacy-indicator icon icon-locked" title="This page is protected from public view"></span>
+                            {% endif %}
+                        </h2>
+                        
 
                         <ul class="actions">
                             {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
@@ -160,11 +175,6 @@
                                 {% else %}
                                     {{ page.title }}
                                 {% endif %}
-
-                                {% test_page_is_public page as is_public %}
-                                {% if not is_public %}
-                                    <em>(private)</em>
-                                {% endif %}
                             {% else %}
                                 {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
                                     <a href="{% url 'wagtailadmin_pages_edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a>
@@ -172,6 +182,11 @@
                                     {{ page.title }}
                                 {% endif %}
                             {% endif %}
+
+                            {% test_page_is_public page as is_public %}
+                            {% if not is_public %}
+                            <span class="privacy-indicator icon icon-locked" title="This page is protected from public view"></span>
+                            {% endif %}
                         </h2>
                         {% if not moving and not choosing %}
                             <ul class="actions">
diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
index a6467532d..2cb53e750 100644
--- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
+++ b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
@@ -61,7 +61,10 @@ def fieldtype(bound_field):
     try:
         return camelcase_to_underscore(bound_field.field.__class__.__name__)
     except AttributeError:
-        return ""
+        try:
+            return camelcase_to_underscore(bound_field.__class__.__name__)
+        except AttributeError:
+            return ""
 
 
 @register.filter
diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 359250162..b5757694d 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import url
 
 from wagtail.wagtailadmin.forms import PasswordResetForm
-from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar, page_view_restrictions
+from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar, page_privacy
 from wagtail.wagtailcore import hooks
 
 
@@ -67,7 +67,7 @@ urlpatterns += [
     url(r'^pages/moderation/(\d+)/reject/$', pages.reject_moderation, name='wagtailadmin_pages_reject_moderation'),
     url(r'^pages/moderation/(\d+)/preview/$', pages.preview_for_moderation, name='wagtailadmin_pages_preview_for_moderation'),
 
-    url(r'^pages/(\d+)/view_restrictions/$', page_view_restrictions.set_view_restrictions, name='wagtailadmin_pages_set_view_restrictions'),
+    url(r'^pages/(\d+)/privacy/$', page_privacy.set_privacy, name='wagtailadmin_pages_set_privacy'),
 
     url(r'^choose-page/$', chooser.browse, name='wagtailadmin_choose_page'),
     url(r'^choose-page/(\d+)/$', chooser.browse, name='wagtailadmin_choose_page_child'),
diff --git a/wagtail/wagtailadmin/views/page_view_restrictions.py b/wagtail/wagtailadmin/views/page_privacy.py
similarity index 87%
rename from wagtail/wagtailadmin/views/page_view_restrictions.py
rename to wagtail/wagtailadmin/views/page_privacy.py
index e36e9900d..4cb7435c7 100644
--- a/wagtail/wagtailadmin/views/page_view_restrictions.py
+++ b/wagtail/wagtailadmin/views/page_privacy.py
@@ -7,7 +7,7 @@ from wagtail.wagtailadmin.forms import PageViewRestrictionForm
 from wagtail.wagtailadmin.modal_workflow import render_modal_workflow
 
 @permission_required('wagtailadmin.access_admin')
-def set_view_restrictions(request, page_id):
+def set_privacy(request, page_id):
     page = get_object_or_404(Page, id=page_id)
     page_perms = page.permissions_for_user(request.user)
     if not page_perms.can_set_view_restrictions():
@@ -39,7 +39,7 @@ def set_view_restrictions(request, page_id):
                         page=page, password = form.cleaned_data['password'])
 
             return render_modal_workflow(
-                request, None, 'wagtailadmin/page_view_restrictions/set_view_restrictions_done.js', {
+                request, None, 'wagtailadmin/page_privacy/set_privacy_done.js', {
                     'is_public': (form.cleaned_data['restriction_type'] == 'none')
                 }
             )
@@ -60,7 +60,7 @@ def set_view_restrictions(request, page_id):
         # display a message indicating that there is a restriction at ancestor level -
         # do not provide the form for setting up new restrictions
         return render_modal_workflow(
-            request, 'wagtailadmin/page_view_restrictions/ancestor_restriction.html', None,
+            request, 'wagtailadmin/page_privacy/ancestor_privacy.html', None,
             {
                 'page_with_restriction': restriction.page,
             }
@@ -69,8 +69,8 @@ def set_view_restrictions(request, page_id):
         # no restriction set at ancestor level - can set restrictions here
         return render_modal_workflow(
             request,
-            'wagtailadmin/page_view_restrictions/set_view_restrictions.html',
-            'wagtailadmin/page_view_restrictions/set_view_restrictions.js', {
+            'wagtailadmin/page_privacy/set_privacy.html',
+            'wagtailadmin/page_privacy/set_privacy.js', {
                 'page': page,
                 'form': form,
             }

From 37519daf7eb15ae143d2b897bc267b98657dbd1f Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 11 Jun 2014 12:56:07 +0100
Subject: [PATCH 077/154] return a RouteResult object back from route() rather
 than a Page, making it possible to transfer params between route() and
 serve()

---
 wagtail/tests/wagtail_hooks.py               |  2 +-
 wagtail/wagtailcore/models.py                |  3 ++-
 wagtail/wagtailcore/tests/test_page_model.py |  4 ++--
 wagtail/wagtailcore/url_routing.py           | 15 +++++++++++++++
 wagtail/wagtailcore/views.py                 | 13 +++++++------
 wagtail/wagtailcore/wagtail_hooks.py         |  2 +-
 6 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 wagtail/wagtailcore/url_routing.py

diff --git a/wagtail/tests/wagtail_hooks.py b/wagtail/tests/wagtail_hooks.py
index 4ad63e881..8c398ed2c 100644
--- a/wagtail/tests/wagtail_hooks.py
+++ b/wagtail/tests/wagtail_hooks.py
@@ -21,7 +21,7 @@ def whitelister_element_rules():
 hooks.register('construct_whitelister_element_rules', whitelister_element_rules)
 
 
-def block_googlebot(page, request):
+def block_googlebot(page, request, serve_args, serve_kwargs):
     if request.META.get('HTTP_USER_AGENT') == 'GoogleBot':
         return HttpResponse("<h1>bad googlebot no cookie</h1>")
 hooks.register('before_serve_page', block_googlebot)
diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index c6cb095a1..b552618aa 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -28,6 +28,7 @@ from treebeard.mp_tree import MP_Node
 
 from wagtail.wagtailcore.utils import camelcase_to_underscore
 from wagtail.wagtailcore.query import PageQuerySet
+from wagtail.wagtailcore.url_routing import RouteResult
 
 from wagtail.wagtailsearch import Indexed, get_search_backend
 
@@ -416,7 +417,7 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
         else:
             # request is for this very page
             if self.live:
-                return self
+                return RouteResult(self)
             else:
                 raise Http404
 
diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py
index ab5b9c148..af12fa705 100644
--- a/wagtail/wagtailcore/tests/test_page_model.py
+++ b/wagtail/wagtailcore/tests/test_page_model.py
@@ -138,7 +138,7 @@ class TestRouting(TestCase):
 
         request = HttpRequest()
         request.path = '/events/christmas/'
-        found_page = homepage.route(request, ['events', 'christmas'])
+        (found_page, args, kwargs) = homepage.route(request, ['events', 'christmas'])
         self.assertEqual(found_page, christmas_page)
 
     def test_request_serving(self):
@@ -243,7 +243,7 @@ class TestServeView(TestCase):
             # Check that a DeprecationWarning has been triggered
             self.assertEqual(len(w), 1)
             self.assertTrue(issubclass(w[-1].category, DeprecationWarning))
-            self.assertTrue("Page.route should return a Page" in str(w[-1].message))
+            self.assertTrue("Page.route should return an instance of wagtailcore.url_routing.RouteResult" in str(w[-1].message))
 
         expected_page = PageWithOldStyleRouteMethod.objects.get(url_path='/home/old-style-route/')
         self.assertEqual(response.status_code, 200)
diff --git a/wagtail/wagtailcore/url_routing.py b/wagtail/wagtailcore/url_routing.py
new file mode 100644
index 000000000..3eb78c6ac
--- /dev/null
+++ b/wagtail/wagtailcore/url_routing.py
@@ -0,0 +1,15 @@
+class RouteResult(object):
+    """
+    An object to be returned from Page.route, which encapsulates
+    all the information necessary to serve an HTTP response. Analogous to
+    django.core.urlresolvers.ResolverMatch, except that it identifies
+    a Page instance that we will call serve(*args, **kwargs) on, rather
+    than a view function.
+    """
+    def __init__(self, page, args=None, kwargs=None):
+        self.page = page
+        self.args = [] if args is None else args
+        self.kwargs = {} if kwargs is None else kwargs
+
+    def __getitem__(self, index):
+        return (self.page, self.args, self.kwargs)[index]
diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py
index 78e0476b6..c05c26212 100644
--- a/wagtail/wagtailcore/views.py
+++ b/wagtail/wagtailcore/views.py
@@ -17,20 +17,21 @@ def serve(request, path):
         raise Http404
 
     path_components = [component for component in path.split('/') if component]
-    page = request.site.root_page.specific.route(request, path_components)
-    if isinstance(page, HttpResponse):
+    route_result = request.site.root_page.specific.route(request, path_components)
+    if isinstance(route_result, HttpResponse):
         warnings.warn(
-            "Page.route should return a Page, not an HttpResponse",
+            "Page.route should return an instance of wagtailcore.url_routing.RouteResult, not an HttpResponse",
             DeprecationWarning
         )
-        return page
+        return route_result
 
+    (page, args, kwargs) = route_result
     for fn in hooks.get_hooks('before_serve_page'):
-        result = fn(page, request)
+        result = fn(page, request, args, kwargs)
         if isinstance(result, HttpResponse):
             return result
 
-    return page.serve(request)
+    return page.serve(request, *args, **kwargs)
 
 
 def authenticate_with_password(request, page_view_restriction_id, page_id):
diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py
index 3763c881b..200af8468 100644
--- a/wagtail/wagtailcore/wagtail_hooks.py
+++ b/wagtail/wagtailcore/wagtail_hooks.py
@@ -1,5 +1,5 @@
 from wagtail.wagtailcore import hooks
 
-def check_view_restrictions(page, request):
+def check_view_restrictions(page, request, serve_args, serve_kwargs):
     return page.check_view_restrictions(request)
 hooks.register('before_serve_page', check_view_restrictions)

From 37f6ea97b1bf6b5a7e0255ce928a304770ff9696 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 11 Jun 2014 13:07:43 +0100
Subject: [PATCH 078/154] Appending to the passed_page_view_restrictions list
 doesn't write it back to the session - need to explicitly write it back to
 the session dict

---
 wagtail/wagtailcore/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py
index c05c26212..b955efa54 100644
--- a/wagtail/wagtailcore/views.py
+++ b/wagtail/wagtailcore/views.py
@@ -49,6 +49,7 @@ def authenticate_with_password(request, page_view_restriction_id, page_id):
             passed_restrictions = request.session.setdefault('passed_page_view_restrictions', [])
             if restriction.id not in passed_restrictions:
                 passed_restrictions.append(restriction.id)
+                request.session['passed_page_view_restrictions'] = passed_restrictions
             if not has_existing_session:
                 # if this is a session we've created, set it to expire at the end
                 # of the browser session

From 812bd990e190d110173cb8c7c2974e4849e6de94 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 11 Jun 2014 13:28:19 +0100
Subject: [PATCH 079/154] remove stray angle bracket

---
 wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 9e252e198..225cf745a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -33,7 +33,7 @@
                     {% if moving %}
                         <h2>
                             {% if parent_page.can_choose %}
-                                <a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id parent_page.id %}">{{ parent_page.title }}</a><
+                                <a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id parent_page.id %}">{{ parent_page.title }}</a>
                             {% else %}
                                 {{ parent_page.title }}
                             {% endif %}

From 4c35928092a5f4cc9db3f064763997a8fce32224 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 11 Jun 2014 17:11:41 +0100
Subject: [PATCH 080/154] add test fixtures for front-end permission testing

---
 wagtail/tests/fixtures/test.json | 57 +++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json
index b769b7960..f6fedf5b8 100644
--- a/wagtail/tests/fixtures/test.json
+++ b/wagtail/tests/fixtures/test.json
@@ -23,7 +23,7 @@
     "model": "wagtailcore.page",
     "fields": {
         "title": "Welcome to the Wagtail test site!",
-        "numchild": 4,
+        "numchild": 5,
         "show_in_menus": false,
         "live": true,
         "depth": 2,
@@ -280,6 +280,52 @@
     }
 },
 
+{
+    "pk": 11,
+    "model": "wagtailcore.page",
+    "fields": {
+        "title": "Secret plans",
+        "numchild": 1,
+        "show_in_menus": true,
+        "live": true,
+        "depth": 3,
+        "content_type": ["tests", "simplepage"],
+        "path": "000100010005",
+        "url_path": "/home/secret-plans/",
+        "slug": "secret-plans"
+    }
+},
+{
+    "pk": 11,
+    "model": "tests.simplepage",
+    "fields": {
+        "content": "<p>muahahahaha</p>"
+    }
+},
+
+{
+    "pk": 12,
+    "model": "wagtailcore.page",
+    "fields": {
+        "title": "Steal underpants",
+        "numchild": 0,
+        "show_in_menus": true,
+        "live": true,
+        "depth": 4,
+        "content_type": ["tests", "simplepage"],
+        "path": "0001000100050001",
+        "url_path": "/home/secret-plans/steal-underpants/",
+        "slug": "steal-underpants"
+    }
+},
+{
+    "pk": 12,
+    "model": "tests.simplepage",
+    "fields": {
+        "content": "<p>it's really important for something</p>"
+    }
+},
+
 {
     "pk": 1,
     "model": "wagtailcore.site",
@@ -537,5 +583,14 @@
         "width": 0,
         "height": 0
     }
+},
+
+{
+    "pk": 1,
+    "model": "wagtailcore.pageviewrestriction",
+    "fields": {
+        "page": 11,
+        "password": "swordfish"
+    }
 }
 ]

From 00942c9de7fabcd85d623335b0b9a6a3cc25aa45 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 12 Jun 2014 12:58:12 +0100
Subject: [PATCH 081/154] add unit tests for user-facing front-end-permission
 views

---
 wagtail/tests/fixtures/test.json              | 10 ++-
 wagtail/tests/models.py                       |  2 +
 .../tests/event_page_password_required.html   | 15 ++++
 .../wagtailcore/tests/test_page_privacy.py    | 70 +++++++++++++++++++
 4 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 wagtail/tests/templates/tests/event_page_password_required.html
 create mode 100644 wagtail/wagtailcore/tests/test_page_privacy.py

diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json
index f6fedf5b8..f31610279 100644
--- a/wagtail/tests/fixtures/test.json
+++ b/wagtail/tests/fixtures/test.json
@@ -312,7 +312,7 @@
         "show_in_menus": true,
         "live": true,
         "depth": 4,
-        "content_type": ["tests", "simplepage"],
+        "content_type": ["tests", "eventpage"],
         "path": "0001000100050001",
         "url_path": "/home/secret-plans/steal-underpants/",
         "slug": "steal-underpants"
@@ -320,9 +320,13 @@
 },
 {
     "pk": 12,
-    "model": "tests.simplepage",
+    "model": "tests.eventpage",
     "fields": {
-        "content": "<p>it's really important for something</p>"
+        "date_from": "2015-07-04",
+        "audience": "private",
+        "location": "Marks and Spencer",
+        "body": "<p>meet in the menswear department at noon</p>",
+        "cost": "free"
     }
 },
 
diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py
index 0c369dd34..81f30f82b 100644
--- a/wagtail/tests/models.py
+++ b/wagtail/tests/models.py
@@ -179,6 +179,8 @@ class EventPage(Page):
     indexed_fields = ('get_audience_display', 'location', 'body')
     search_name = "Event"
 
+    password_required_template = 'tests/event_page_password_required.html'
+
 EventPage.content_panels = [
     FieldPanel('title', classname="full title"),
     FieldPanel('date_from'),
diff --git a/wagtail/tests/templates/tests/event_page_password_required.html b/wagtail/tests/templates/tests/event_page_password_required.html
new file mode 100644
index 000000000..e58d740ad
--- /dev/null
+++ b/wagtail/tests/templates/tests/event_page_password_required.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<html>
+    <head>
+        <title>{{ self.title }}</title>
+    </head>
+    <body>
+        <h1>{{ self.title }}</h1>
+        <p>This event is invitation only. Please enter your password to see the details.</p>
+        <form action="{{ action_url }}" method="POST">
+            {% csrf_token %}
+            {{ form.as_p }}
+            <input type="submit" value="Continue" />
+        </form>
+    </body>
+</html>
diff --git a/wagtail/wagtailcore/tests/test_page_privacy.py b/wagtail/wagtailcore/tests/test_page_privacy.py
new file mode 100644
index 000000000..1159f13ab
--- /dev/null
+++ b/wagtail/wagtailcore/tests/test_page_privacy.py
@@ -0,0 +1,70 @@
+from django.test import TestCase
+from wagtail.wagtailcore.models import Page, PageViewRestriction
+
+
+class TestPagePrivacy(TestCase):
+    fixtures = ['test.json']
+
+    def setUp(self):
+        self.secret_plans_page = Page.objects.get(url_path='/home/secret-plans/')
+        self.view_restriction = PageViewRestriction.objects.get(
+            page=self.secret_plans_page)
+
+    def test_anonymous_user_must_authenticate(self):
+        response = self.client.get('/secret-plans/')
+        self.assertEqual(response.templates[0].name, 'wagtailcore/password_required.html')
+
+        submit_url = "/_util/authenticate_with_password/%d/%d/" % (self.view_restriction.id, self.secret_plans_page.id)
+        self.assertContains(response, '<form action="%s"' % submit_url)
+        self.assertContains(response, '<input id="id_return_url" name="return_url" type="hidden" value="/secret-plans/" />')
+
+        # posting the wrong password should redisplay the password page
+        response = self.client.post(submit_url, {
+            'password': 'wrongpassword',
+            'return_url': '/secret-plans/',
+        })
+        self.assertEqual(response.templates[0].name, 'wagtailcore/password_required.html')
+        self.assertContains(response, '<form action="%s"' % submit_url)
+
+        # posting the correct password should redirect back to return_url
+        response = self.client.post(submit_url, {
+            'password': 'swordfish',
+            'return_url': '/secret-plans/',
+        })
+        self.assertRedirects(response, '/secret-plans/')
+
+        # now requests to /secret-plans/ should pass authentication
+        response = self.client.get('/secret-plans/')
+        self.assertEqual(response.templates[0].name, 'tests/simple_page.html')
+
+
+    def test_view_restrictions_apply_to_subpages(self):
+        underpants_page = Page.objects.get(url_path='/home/secret-plans/steal-underpants/')
+        response = self.client.get('/secret-plans/steal-underpants/')
+
+        # check that we're overriding the default password_required template for this page type
+        self.assertEqual(response.templates[0].name, 'tests/event_page_password_required.html')
+
+        submit_url = "/_util/authenticate_with_password/%d/%d/" % (self.view_restriction.id, underpants_page.id)
+        self.assertContains(response, '<title>Steal underpants</title>')
+        self.assertContains(response, '<form action="%s"' % submit_url)
+        self.assertContains(response, '<input id="id_return_url" name="return_url" type="hidden" value="/secret-plans/steal-underpants/" />')
+
+        # posting the wrong password should redisplay the password page
+        response = self.client.post(submit_url, {
+            'password': 'wrongpassword',
+            'return_url': '/secret-plans/steal-underpants/',
+        })
+        self.assertEqual(response.templates[0].name, 'tests/event_page_password_required.html')
+        self.assertContains(response, '<form action="%s"' % submit_url)
+
+        # posting the correct password should redirect back to return_url
+        response = self.client.post(submit_url, {
+            'password': 'swordfish',
+            'return_url': '/secret-plans/steal-underpants/',
+        })
+        self.assertRedirects(response, '/secret-plans/steal-underpants/')
+
+        # now requests to /secret-plans/ should pass authentication
+        response = self.client.get('/secret-plans/steal-underpants/')
+        self.assertEqual(response.templates[0].name, 'tests/event_page.html')

From dffd4413751ef0f9372d28c742ecbfb78887b6f3 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 12 Jun 2014 14:40:34 +0100
Subject: [PATCH 082/154] adding privacy setter into page listing. previously
 omitted by error. Also fixing breadcrumbs within page chooser, broken for a
 while.

---
 .../wagtailadmin/scss/components/listing.scss | 21 ++++++++++++++++++-
 .../templates/wagtailadmin/pages/list.html    |  6 +-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index 8a5baa8d3..94259cc96 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -343,7 +343,6 @@ ul.listing{
                 background:$color-teal-darker;
             }
         }
-
     }
 }
 ul.listing{
@@ -357,6 +356,8 @@ table.listing{
 
  /* explorer specific tweaks */
 .page-explorer .listing {
+    position:relative;
+
     .index{
         color:white;
         background-color:$color-header-bg;
@@ -366,6 +367,13 @@ table.listing{
             padding-bottom:1.5em;
         }
 
+        .privacy-indicator{
+            opacity:1;
+            position:absolute;
+            right:5%;
+            top:2em;
+        }
+
         .title{
             h2{
                 color:white;
@@ -375,10 +383,21 @@ table.listing{
                 a:hover{
                     color:white;
                 }
+
+                .privacy-indicator{
+                    position:relative;
+                    right:auto;
+                    top:auto;
+                    opacity:0.7;
+                }
             }
+
         }
+
+        
     }
 
+
     .privacy-indicator{
         font-size:0.9em;
         opacity:0.7;
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 225cf745a..3c40d05f0 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -63,13 +63,9 @@
                             {% else %}
                                     {{ parent_page.title }}
                             {% endif %}
-
-                            {% test_page_is_public parent_page as is_public %}
-                            {% if not is_public %}
-                                <span class="privacy-indicator icon icon-locked" title="This page is protected from public view"></span>
-                            {% endif %}
                         </h2>
                         
+                        {% include "wagtailadmin/pages/_privacy_indicator.html" with page=parent_page %}
 
                         <ul class="actions">
                             {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}

From 1c47560c0205d8feaaac503ccdfee2b0cc854606 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Thu, 12 Jun 2014 16:37:44 +0100
Subject: [PATCH 083/154] tweaking size of privacy indicator

---
 .../wagtailadmin/scss/components/formatters.scss      |  6 ++++++
 .../static/wagtailadmin/scss/components/listing.scss  | 11 +----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
index b88c4fd60..b6f5ca03c 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss
@@ -137,6 +137,12 @@ a.status-tag.primary:hover{
 }
 
 .privacy-indicator {
+    .label-private, .label-public{
+        &:before{
+            font-size:1.5em;
+            color:$color-teal;
+        }
+    }
     &.public {
         .label-private { 
             display: none;
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
index 94259cc96..537465083 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
@@ -368,6 +368,7 @@ table.listing{
         }
 
         .privacy-indicator{
+            font-size:1em;
             opacity:1;
             position:absolute;
             right:5%;
@@ -383,21 +384,11 @@ table.listing{
                 a:hover{
                     color:white;
                 }
-
-                .privacy-indicator{
-                    position:relative;
-                    right:auto;
-                    top:auto;
-                    opacity:0.7;
-                }
             }
 
         }
-
-        
     }
 
-
     .privacy-indicator{
         font-size:0.9em;
         opacity:0.7;

From c4216a036341ee27a317d93645772bf7ee17aee3 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 13 Jun 2014 22:32:33 +0100
Subject: [PATCH 084/154] syntactic tweak

---
 wagtail/wagtailcore/url_routing.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailcore/url_routing.py b/wagtail/wagtailcore/url_routing.py
index 3eb78c6ac..0d7a5e1c4 100644
--- a/wagtail/wagtailcore/url_routing.py
+++ b/wagtail/wagtailcore/url_routing.py
@@ -8,8 +8,8 @@ class RouteResult(object):
     """
     def __init__(self, page, args=None, kwargs=None):
         self.page = page
-        self.args = [] if args is None else args
-        self.kwargs = {} if kwargs is None else kwargs
+        self.args = args or []
+        self.kwargs = kwargs or {}
 
     def __getitem__(self, index):
         return (self.page, self.args, self.kwargs)[index]

From e0a18729219adb1e0e3e51a5b0ac5755020c78bd Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 12:47:34 +0100
Subject: [PATCH 085/154] Added tests for FEP backend views

---
 wagtail/wagtailadmin/tests/test_privacy.py | 261 +++++++++++++++++++++
 1 file changed, 261 insertions(+)
 create mode 100644 wagtail/wagtailadmin/tests/test_privacy.py

diff --git a/wagtail/wagtailadmin/tests/test_privacy.py b/wagtail/wagtailadmin/tests/test_privacy.py
new file mode 100644
index 000000000..4d80ab27f
--- /dev/null
+++ b/wagtail/wagtailadmin/tests/test_privacy.py
@@ -0,0 +1,261 @@
+from django.test import TestCase
+from django.core.urlresolvers import reverse
+
+from wagtail.wagtailcore.models import Page, PageViewRestriction
+from wagtail.tests.models import SimplePage
+from wagtail.tests.utils import WagtailTestUtils
+
+
+class TestSetPrivacyView(TestCase, WagtailTestUtils):
+    def setUp(self):
+        self.login()
+
+        # Create some pages
+        self.homepage = Page.objects.get(id=2)
+
+        self.public_page = self.homepage.add_child(instance=SimplePage(
+            title="Public page",
+            slug='public-page',
+            live=True,
+        ))
+
+        self.private_page = self.homepage.add_child(instance=SimplePage(
+            title="Private page",
+            slug='private-page',
+            live=True,
+        ))
+        PageViewRestriction.objects.create(page=self.private_page, password='password123')
+
+        self.private_child_page = self.private_page.add_child(instance=SimplePage(
+            title="Private child page",
+            slug='private-child-page',
+            live=True,
+        ))
+
+    def test_get_public(self):
+        """
+        This tests that a blank form is returned when a user opens the set_privacy view on a public page
+        """
+        response = self.client.get(reverse('wagtailadmin_pages_set_privacy', args=(self.public_page.id, )))
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/page_privacy/set_privacy.html')
+        self.assertEqual(response.context['page'].specific, self.public_page)
+
+        # Check form attributes
+        self.assertEqual(response.context['form']['restriction_type'].value(), 'none')
+
+    def test_get_private(self):
+        """
+        This tests that the restriction type and password fields as set correctly when a user opens the set_privacy view on a public page
+        """
+        response = self.client.get(reverse('wagtailadmin_pages_set_privacy', args=(self.private_page.id, )))
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/page_privacy/set_privacy.html')
+        self.assertEqual(response.context['page'].specific, self.private_page)
+
+        # Check form attributes
+        self.assertEqual(response.context['form']['restriction_type'].value(), 'password')
+        self.assertEqual(response.context['form']['password'].value(), 'password123')
+
+    def test_get_private_child(self):
+        """
+        This tests that the set_privacy view tells the user that the password restriction has been applied to an ancestor
+        """
+        response = self.client.get(reverse('wagtailadmin_pages_set_privacy', args=(self.private_child_page.id, )))
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/page_privacy/ancestor_privacy.html')
+        self.assertEqual(response.context['page_with_restriction'].specific, self.private_page)
+
+    def test_set_password_restriction(self):
+        """
+        This tests that setting a password restriction using the set_privacy view works
+        """
+        post_data = {
+            'restriction_type': 'password',
+            'password': 'helloworld',
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_set_privacy', args=(self.public_page.id, )), post_data)
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "modal.respond('setPermission', false);")
+
+        # Check that a page restriction has been created
+        self.assertTrue(PageViewRestriction.objects.filter(page=self.public_page).exists())
+
+        # Check that the password is set correctly
+        self.assertEqual(PageViewRestriction.objects.get(page=self.public_page).password, 'helloworld')
+
+    def test_set_password_restriction_password_unset(self):
+        """
+        This tests that the password field on the form is validated correctly
+        """
+        post_data = {
+            'restriction_type': 'password',
+            'password': '',
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_set_privacy', args=(self.public_page.id, )), post_data)
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+
+        # Check that a form error was raised
+        self.assertFormError(response, 'form', 'password', "This field is required.")
+
+    def test_unset_password_restriction(self):
+        """
+        This tests that removing a password restriction using the set_privacy view works
+        """
+        post_data = {
+            'restriction_type': 'none',
+            'password': '',
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_set_privacy', args=(self.private_page.id, )), post_data)
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "modal.respond('setPermission', true);")
+
+        # Check that the page restriction has been deleted
+        self.assertFalse(PageViewRestriction.objects.filter(page=self.private_page).exists())
+
+
+class TestPrivacyIndicators(TestCase, WagtailTestUtils):
+    def setUp(self):
+        self.login()
+
+        # Create some pages
+        self.homepage = Page.objects.get(id=2)
+
+        self.public_page = self.homepage.add_child(instance=SimplePage(
+            title="Public page",
+            slug='public-page',
+            live=True,
+        ))
+
+        self.private_page = self.homepage.add_child(instance=SimplePage(
+            title="Private page",
+            slug='private-page',
+            live=True,
+        ))
+        PageViewRestriction.objects.create(page=self.private_page, password='password123')
+
+        self.private_child_page = self.private_page.add_child(instance=SimplePage(
+            title="Private child page",
+            slug='private-child-page',
+            live=True,
+        ))
+
+    def test_explorer_public(self):
+        """
+        This tests that the privacy indicator on the public pages explore view is set to "PUBLIC"
+        """
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.public_page.id, )))
+
+        # Check the response
+        self.assertEqual(response.status_code, 200)
+
+        # Check the privacy indicator is public
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertContains(response, '<div class="privacy-indicator public">')
+        self.assertNotContains(response, '<div class="privacy-indicator private">')
+
+    def test_explorer_private(self):
+        """
+        This tests that the privacy indicator on the private pages explore view is set to "PRIVATE"
+        """
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.private_page.id, )))
+
+        # Check the response
+        self.assertEqual(response.status_code, 200)
+
+        # Check the privacy indicator is public
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertContains(response, '<div class="privacy-indicator private">')
+        self.assertNotContains(response, '<div class="privacy-indicator public">')
+
+    def test_explorer_private_child(self):
+        """
+        This tests that the privacy indicator on the private child pages explore view is set to "PRIVATE"
+        """
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.private_child_page.id, )))
+
+        # Check the response
+        self.assertEqual(response.status_code, 200)
+
+        # Check the privacy indicator is public
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertContains(response, '<div class="privacy-indicator private">')
+        self.assertNotContains(response, '<div class="privacy-indicator public">')
+
+    def test_explorer_list_homepage(self):
+        """
+        This tests that there is a padlock displayed next to the private page in the homepages explorer listing
+        """
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.homepage.id, )))
+
+        # Check the response
+        self.assertEqual(response.status_code, 200)
+
+        # Must have one privacy icon (next to the private page)
+        self.assertContains(response, "<span class=\"privacy-indicator icon icon-locked\"", count=1)
+
+    def test_explorer_list_private(self):
+        """
+        This tests that there is a padlock displayed next to the private child page in the private pages explorer listing
+        """
+        response = self.client.get(reverse('wagtailadmin_explore', args=(self.private_page.id, )))
+
+        # Check the response
+        self.assertEqual(response.status_code, 200)
+
+        # Must have one privacy icon (next to the private child page)
+        self.assertContains(response, "<span class=\"privacy-indicator icon icon-locked\"", count=1)
+
+    def test_edit_public(self):
+        """
+        This tests that the privacy indicator on the public pages edit view is set to "PUBLIC"
+        """
+        response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.public_page.id, )))
+
+        # Check the response
+        self.assertEqual(response.status_code, 200)
+
+        # Check the privacy indicator is public
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertContains(response, '<div class="privacy-indicator public">')
+        self.assertNotContains(response, '<div class="privacy-indicator private">')
+
+    def test_edit_private(self):
+        """
+        This tests that the privacy indicator on the private pages edit view is set to "PRIVATE"
+        """
+        response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.private_page.id, )))
+
+        # Check the response
+        self.assertEqual(response.status_code, 200)
+
+        # Check the privacy indicator is public
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertContains(response, '<div class="privacy-indicator private">')
+        self.assertNotContains(response, '<div class="privacy-indicator public">')
+
+    def test_edit_private_child(self):
+        """
+        This tests that the privacy indicator on the private child pages edit view is set to "PRIVATE"
+        """
+        response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.private_child_page.id, )))
+
+        # Check the response
+        self.assertEqual(response.status_code, 200)
+
+        # Check the privacy indicator is public
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertContains(response, '<div class="privacy-indicator private">')
+        self.assertNotContains(response, '<div class="privacy-indicator public">')

From 5cead3c40af4e56034c61ca6b07146e57d45c76c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 14:10:06 +0100
Subject: [PATCH 086/154] Added public and not_public filters to PageQuerySet

---
 wagtail/wagtailcore/models.py                 |  6 +++
 wagtail/wagtailcore/query.py                  | 14 +++++++
 .../wagtailcore/tests/test_page_queryset.py   | 42 ++++++++++++++++++-
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index b552618aa..ecfa65ee8 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -229,6 +229,12 @@ class PageManager(models.Manager):
     def not_type(self, model):
         return self.get_queryset().not_type(model)
 
+    def public(self):
+        return self.get_queryset().public()
+
+    def not_public(self):
+        return self.get_queryset().not_public()
+
 
 class PageBase(models.base.ModelBase):
     """Metaclass for Page"""
diff --git a/wagtail/wagtailcore/query.py b/wagtail/wagtailcore/query.py
index 57e8ffff3..e0b6cc869 100644
--- a/wagtail/wagtailcore/query.py
+++ b/wagtail/wagtailcore/query.py
@@ -107,3 +107,17 @@ class PageQuerySet(MP_NodeQuerySet):
 
     def not_type(self, model):
         return self.exclude(self.type_q(model))
+
+    def public_q(self):
+        from wagtail.wagtailcore.models import PageViewRestriction
+
+        q = Q()
+        for restriction in PageViewRestriction.objects.all():
+            q &= ~self.descendant_of_q(restriction.page, inclusive=True)
+        return q
+
+    def public(self):
+        return self.filter(self.public_q())
+
+    def not_public(self):
+        return self.exclude(self.public_q())
diff --git a/wagtail/wagtailcore/tests/test_page_queryset.py b/wagtail/wagtailcore/tests/test_page_queryset.py
index bc07f0fba..df5367dc8 100644
--- a/wagtail/wagtailcore/tests/test_page_queryset.py
+++ b/wagtail/wagtailcore/tests/test_page_queryset.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from wagtail.wagtailcore.models import Page
+from wagtail.wagtailcore.models import Page, PageViewRestriction
 from wagtail.tests.models import EventPage
 
 
@@ -270,3 +270,43 @@ class TestPageQuerySet(TestCase):
         # Check that the homepage is in the results
         homepage = Page.objects.get(url_path='/home/')
         self.assertTrue(pages.filter(id=homepage.id).exists())
+
+    def test_public(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        event = Page.objects.get(url_path='/home/events/christmas/')
+        homepage = Page.objects.get(url_path='/home/')
+
+        # Add PageViewRestriction to events_index
+        PageViewRestriction.objects.create(page=events_index, password='hello')
+
+        # Get public pages
+        pages = Page.objects.public()
+
+        # Check that the homepage is in the results
+        self.assertTrue(pages.filter(id=homepage.id).exists())
+
+        # Check that the events index is not in the results
+        self.assertFalse(pages.filter(id=events_index.id).exists())
+
+        # Check that the event is not in the results
+        self.assertFalse(pages.filter(id=event.id).exists())
+
+    def test_not_public(self):
+        events_index = Page.objects.get(url_path='/home/events/')
+        event = Page.objects.get(url_path='/home/events/christmas/')
+        homepage = Page.objects.get(url_path='/home/')
+
+        # Add PageViewRestriction to events_index
+        PageViewRestriction.objects.create(page=events_index, password='hello')
+
+        # Get public pages
+        pages = Page.objects.not_public()
+
+        # Check that the homepage is not in the results
+        self.assertFalse(pages.filter(id=homepage.id).exists())
+
+        # Check that the events index is in the results
+        self.assertTrue(pages.filter(id=events_index.id).exists())
+
+        # Check that the event is in the results
+        self.assertTrue(pages.filter(id=event.id).exists())

From bfa04dfd24b69c7276a7324d5bdc8dfe2487e720 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 16:14:42 +0100
Subject: [PATCH 087/154] Added assertRegex to WagtailTestUtils

---
 wagtail/tests/utils.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py
index c44549401..9360f2206 100644
--- a/wagtail/tests/utils.py
+++ b/wagtail/tests/utils.py
@@ -1,4 +1,5 @@
 from django.contrib.auth.models import User
+from django.utils import six
 
 # We need to make sure that we're using the same unittest library that Django uses internally
 # Otherwise, we get issues with the "SkipTest" and "ExpectedFailure" exceptions being recognised as errors
@@ -21,3 +22,6 @@ class WagtailTestUtils(object):
         self.client.login(username='test', password='password')
 
         return user
+
+    def assertRegex(self, *args, **kwargs):
+        six.assertRegex(self, *args, **kwargs)

From 6d82826efefa60df3d87f4f9217e2cae97ad7719 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 16:14:59 +0100
Subject: [PATCH 088/154] Added failing test for #222

---
 .../wagtailadmin/tests/test_pages_views.py    | 114 +++++++++++++++++-
 1 file changed, 112 insertions(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 9e95e50b1..2fe0a3476 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -7,8 +7,8 @@ from django.core import mail
 from django.core.paginator import Paginator
 from django.utils import timezone
 
-from wagtail.tests.models import SimplePage, EventPage, StandardIndex, BusinessIndex, BusinessChild, BusinessSubIndex
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.tests.models import SimplePage, EventPage, EventPageCarouselItem, StandardIndex, BusinessIndex, BusinessChild, BusinessSubIndex
+from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.wagtailcore.models import Page, PageRevision
 from wagtail.wagtailcore.signals import page_published
 from wagtail.wagtailusers.models import UserProfile
@@ -654,6 +654,116 @@ class TestPageEdit(TestCase, WagtailTestUtils):
         self.assertContains(response, "I&#39;ve been edited!")
 
 
+class TestPageEditReordering(TestCase, WagtailTestUtils):
+    def setUp(self):
+        # Find root page
+        self.root_page = Page.objects.get(id=2)
+
+        # Add event page
+        self.event_page = EventPage()
+        self.event_page.title = "Event page"
+        self.event_page.slug = "event-page"
+        self.event_page.carousel_items = [
+            EventPageCarouselItem(caption='1234567', sort_order=1),
+            EventPageCarouselItem(caption='7654321', sort_order=2),
+            EventPageCarouselItem(caption='abcdefg', sort_order=3),
+        ]
+        self.root_page.add_child(instance=self.event_page)
+
+        # Login
+        self.user = self.login()
+
+    def check_order(self, response, expected_order):
+        inline_panel = response.context['edit_handler'].children[0].children[9]
+        order = [form.instance.caption for form in inline_panel.formset]
+        self.assertEqual(order, expected_order)
+
+    def test_order(self):
+        response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )))
+
+        self.assertEqual(response.status_code, 200)
+        self.check_order(response, ['1234567', '7654321', 'abcdefg'])
+
+    def test_reorder(self):
+        post_data = {
+            'title': "Event page",
+            'slug': 'event-page',
+
+            'date_from': '01/01/2014',
+            'cost': '$10',
+            'audience': 'public',
+            'location': 'somewhere',
+
+            'related_links-INITIAL_FORMS': 0,
+            'related_links-MAX_NUM_FORMS': 1000,
+            'related_links-TOTAL_FORMS': 0,
+
+            'speakers-INITIAL_FORMS': 0,
+            'speakers-MAX_NUM_FORMS': 1000,
+            'speakers-TOTAL_FORMS': 0,
+
+            'carousel_items-INITIAL_FORMS': 3,
+            'carousel_items-MAX_NUM_FORMS': 1000,
+            'carousel_items-TOTAL_FORMS': 3,
+            'carousel_items-0-id': self.event_page.carousel_items.all()[0].id,
+            'carousel_items-0-caption': self.event_page.carousel_items.all()[0].caption,
+            'carousel_items-0-ORDER': 2,
+            'carousel_items-1-id': self.event_page.carousel_items.all()[1].id,
+            'carousel_items-1-caption': self.event_page.carousel_items.all()[1].caption,
+            'carousel_items-1-ORDER': 3,
+            'carousel_items-2-id': self.event_page.carousel_items.all()[2].id,
+            'carousel_items-2-caption': self.event_page.carousel_items.all()[2].caption,
+            'carousel_items-2-ORDER': 1,
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )), post_data)
+
+        # Should be redirected to explorer page
+        self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
+
+        # Check order
+        response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )))
+
+        self.assertEqual(response.status_code, 200)
+        self.check_order(response, ['abcdefg', '1234567', '7654321'])
+
+    @unittest.expectedFailure
+    def test_reorder_with_validation_error(self):
+        post_data = {
+            'title': "", # Validation error
+            'slug': 'event-page',
+
+            'date_from': '01/01/2014',
+            'cost': '$10',
+            'audience': 'public',
+            'location': 'somewhere',
+
+            'related_links-INITIAL_FORMS': 0,
+            'related_links-MAX_NUM_FORMS': 1000,
+            'related_links-TOTAL_FORMS': 0,
+
+            'speakers-INITIAL_FORMS': 0,
+            'speakers-MAX_NUM_FORMS': 1000,
+            'speakers-TOTAL_FORMS': 0,
+
+            'carousel_items-INITIAL_FORMS': 3,
+            'carousel_items-MAX_NUM_FORMS': 1000,
+            'carousel_items-TOTAL_FORMS': 3,
+            'carousel_items-0-id': self.event_page.carousel_items.all()[0].id,
+            'carousel_items-0-caption': self.event_page.carousel_items.all()[0].caption,
+            'carousel_items-0-ORDER': 2,
+            'carousel_items-1-id': self.event_page.carousel_items.all()[1].id,
+            'carousel_items-1-caption': self.event_page.carousel_items.all()[1].caption,
+            'carousel_items-1-ORDER': 3,
+            'carousel_items-2-id': self.event_page.carousel_items.all()[2].id,
+            'carousel_items-2-caption': self.event_page.carousel_items.all()[2].caption,
+            'carousel_items-2-ORDER': 1,
+        }
+        response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )), post_data)
+
+        self.assertEqual(response.status_code, 200)
+        self.check_order(response, ['abcdefg', '1234567', '7654321'])
+
+
 class TestPageDelete(TestCase, WagtailTestUtils):
     def setUp(self):
         # Find root page

From eebb0ce711d342b75a62d68cc2a479589f0ae6ad Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 16:23:34 +0100
Subject: [PATCH 089/154] Fixed a few errors in edit handlers tests

---
 wagtail/wagtailadmin/tests/test_edit_handlers.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py
index 48e24aff2..8b499378c 100644
--- a/wagtail/wagtailadmin/tests/test_edit_handlers.py
+++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py
@@ -312,6 +312,10 @@ class TestInlinePanel(TestCase):
                           'ORDER': MagicMock()}
                 instance = FakeInstance()
 
+                cleaned_data = {
+                    'ORDER': 0,
+                }
+
                 def __repr__(self):
                     return 'fake form'
 
@@ -319,6 +323,9 @@ class TestInlinePanel(TestCase):
             empty_form = FakeForm()
             can_order = True
 
+            def is_valid(self):
+                return True
+
         label = 'label'
         help_text = 'help text'
         errors = ['errors']

From 7c434f652a0961a5eca484322a8e774ce96b658c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 16:24:21 +0100
Subject: [PATCH 090/154] Tweaked reordering test to use InlinePanel children
 rather than its formset

---
 wagtail/wagtailadmin/tests/test_pages_views.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py
index 2fe0a3476..1551eaab2 100644
--- a/wagtail/wagtailadmin/tests/test_pages_views.py
+++ b/wagtail/wagtailadmin/tests/test_pages_views.py
@@ -675,7 +675,7 @@ class TestPageEditReordering(TestCase, WagtailTestUtils):
 
     def check_order(self, response, expected_order):
         inline_panel = response.context['edit_handler'].children[0].children[9]
-        order = [form.instance.caption for form in inline_panel.formset]
+        order = [child.form.instance.caption for child in inline_panel.children]
         self.assertEqual(order, expected_order)
 
     def test_order(self):
@@ -726,7 +726,6 @@ class TestPageEditReordering(TestCase, WagtailTestUtils):
         self.assertEqual(response.status_code, 200)
         self.check_order(response, ['abcdefg', '1234567', '7654321'])
 
-    @unittest.expectedFailure
     def test_reorder_with_validation_error(self):
         post_data = {
             'title': "", # Validation error

From 7d4f4c2edd8474542f0b9bb5acf359c9e5a7a14d Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 4 Jul 2014 16:34:50 +0100
Subject: [PATCH 091/154] Don't include protected pages in sitemap. Fixes #407

---
 .../contrib/wagtailsitemaps/sitemap_generator.py    |  2 +-
 wagtail/contrib/wagtailsitemaps/tests.py            | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/wagtail/contrib/wagtailsitemaps/sitemap_generator.py b/wagtail/contrib/wagtailsitemaps/sitemap_generator.py
index eb08d81b7..d22f88112 100644
--- a/wagtail/contrib/wagtailsitemaps/sitemap_generator.py
+++ b/wagtail/contrib/wagtailsitemaps/sitemap_generator.py
@@ -8,7 +8,7 @@ class Sitemap(object):
         self.site = site
 
     def get_pages(self):
-        return self.site.root_page.get_descendants(inclusive=True).live().order_by('path')
+        return self.site.root_page.get_descendants(inclusive=True).live().public().order_by('path')
 
     def get_urls(self):
         for page in self.get_pages():
diff --git a/wagtail/contrib/wagtailsitemaps/tests.py b/wagtail/contrib/wagtailsitemaps/tests.py
index d2d612fa2..469e210ad 100644
--- a/wagtail/contrib/wagtailsitemaps/tests.py
+++ b/wagtail/contrib/wagtailsitemaps/tests.py
@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.core.cache import cache
 
-from wagtail.wagtailcore.models import Page, Site
+from wagtail.wagtailcore.models import Page, PageViewRestriction, Site
 from wagtail.tests.models import SimplePage
 
 from .sitemap_generator import Sitemap
@@ -23,6 +23,13 @@ class TestSitemapGenerator(TestCase):
             live=False,
         ))
 
+        self.protected_child_page = self.home_page.add_child(instance=SimplePage(
+            title="Protected",
+            slug='protected',
+            live=True,
+        ))
+        PageViewRestriction.objects.create(page=self.protected_child_page, password='hello')
+
         self.site = Site.objects.get(is_default_site=True)
 
     def test_get_pages(self):
@@ -31,6 +38,7 @@ class TestSitemapGenerator(TestCase):
 
         self.assertIn(self.child_page.page_ptr, pages)
         self.assertNotIn(self.unpublished_child_page.page_ptr, pages)
+        self.assertNotIn(self.protected_child_page.page_ptr, pages)
 
     def test_get_urls(self):
         sitemap = Sitemap(self.site)
@@ -49,6 +57,9 @@ class TestSitemapGenerator(TestCase):
         # Make sure the unpublished page didn't make it into the xml
         self.assertNotIn('/unpublished/', xml)
 
+        # Make sure the protected page didn't make it into the xml
+        self.assertNotIn('/protected/', xml)
+
 
 class TestSitemapView(TestCase):
     def test_sitemap_view(self):

From e23975eb933d10b542e719387fc7473e958faedb Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 4 Jul 2014 16:56:14 +0100
Subject: [PATCH 092/154] move Page.check_view_restrictions back into the body
 of the check_view_restrictions hook - it's view-level functionality, not
 model level, and its presence in the Page model is confusing (and the reason
 it was there has now been superseded). See
 https://groups.google.com/d/msg/wagtail/085Z7Mp73gE/dqfxW0sC72IJ

---
 wagtail/wagtailcore/models.py        | 21 ---------------------
 wagtail/wagtailcore/wagtail_hooks.py | 22 +++++++++++++++++++++-
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index ecfa65ee8..52aa60e4f 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -13,7 +13,6 @@ from django.http import Http404
 from django.core.cache import cache
 from django.core.handlers.wsgi import WSGIRequest
 from django.core.handlers.base import BaseHandler
-from django.core.urlresolvers import reverse
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import Group
 from django.conf import settings
@@ -821,26 +820,6 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)):
         """Return a query set of all page view restrictions that apply to this page"""
         return PageViewRestriction.objects.filter(page__in=self.get_ancestors(inclusive=True))
 
-    def check_view_restrictions(self, request):
-        """
-        Check whether there are any view restrictions on this page which are
-        not fulfilled by the given request object. If there are, return an
-        HttpResponse that will notify the user of that restriction (and possibly
-        include a password / login form that will allow them to proceed). If
-        there are no such restrictions, return None
-        """
-        restrictions = self.get_view_restrictions()
-
-        if restrictions:
-            passed_restrictions = request.session.get('passed_page_view_restrictions', [])
-            for restriction in restrictions:
-                if restriction.id not in passed_restrictions:
-                    from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm
-                    form = PasswordPageViewRestrictionForm(instance=restriction,
-                        initial={'return_url': request.get_full_path()})
-                    action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, self.id])
-                    return self.serve_password_required_response(request, form, action_url)
-
     password_required_template = getattr(settings, 'PASSWORD_REQUIRED_TEMPLATE', 'wagtailcore/password_required.html')
     def serve_password_required_response(self, request, form, action_url):
         """
diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py
index 200af8468..ef6ca9f82 100644
--- a/wagtail/wagtailcore/wagtail_hooks.py
+++ b/wagtail/wagtailcore/wagtail_hooks.py
@@ -1,5 +1,25 @@
+from django.core.urlresolvers import reverse
+
 from wagtail.wagtailcore import hooks
 
 def check_view_restrictions(page, request, serve_args, serve_kwargs):
-    return page.check_view_restrictions(request)
+    """
+    Check whether there are any view restrictions on this page which are
+    not fulfilled by the given request object. If there are, return an
+    HttpResponse that will notify the user of that restriction (and possibly
+    include a password / login form that will allow them to proceed). If
+    there are no such restrictions, return None
+    """
+    restrictions = page.get_view_restrictions()
+
+    if restrictions:
+        passed_restrictions = request.session.get('passed_page_view_restrictions', [])
+        for restriction in restrictions:
+            if restriction.id not in passed_restrictions:
+                from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm
+                form = PasswordPageViewRestrictionForm(instance=restriction,
+                    initial={'return_url': request.get_full_path()})
+                action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id])
+                return page.serve_password_required_response(request, form, action_url)
+
 hooks.register('before_serve_page', check_view_restrictions)

From 06c79d4866cdc4c50fa1259cdaef54e27d031de9 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 4 Jul 2014 17:50:26 +0100
Subject: [PATCH 093/154] update building_your_site and model_recipes docs to
 cover the new route/serve API

---
 docs/building_your_site/djangodevelopers.rst |  7 ++--
 docs/model_recipes.rst                       | 41 +++++++++++++-------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/docs/building_your_site/djangodevelopers.rst b/docs/building_your_site/djangodevelopers.rst
index c24040364..89f0ed642 100644
--- a/docs/building_your_site/djangodevelopers.rst
+++ b/docs/building_your_site/djangodevelopers.rst
@@ -177,9 +177,10 @@ Anatomy of a Wagtail Request
 For going beyond the basics of model definition and interrelation, it might help to know how Wagtail handles requests and constructs responses. In short, it goes something like:
 
     #.  Django gets a request and routes through Wagtail's URL dispatcher definitions
-    #.  Starting from the root content piece, Wagtail traverses the page tree, letting the model for each piece of content along the path decide how to ``route()`` the next step in the path.
-    #.  A model class decides that routing is done and it's now time to ``serve()`` content.
-    #.  ``serve()`` constructs a context using ``get_context()``
+    #.  Wagtail checks the hostname of the request to determine which ``Site`` record will handle this request.
+    #.  Starting from the root page of that site, Wagtail traverses the page tree, calling the ``route()`` method and letting each page model decide whether it will handle the request itself or pass it on to a child page.
+    #.  The page responsible for handling the request returns a ``RouteResult`` object from ``route()``, which identifies the page along with any additional args/kwargs to be passed to ``serve()``.
+    #.  Wagtail calls ``serve()``, which constructs a context using ``get_context()``
     #.  ``serve()`` finds a template to pass it to using ``get_template()``
     #.  A response object is returned by ``serve()`` and Django responds to the requester.
 
diff --git a/docs/model_recipes.rst b/docs/model_recipes.rst
index e799ef70a..7f9b5f7b6 100644
--- a/docs/model_recipes.rst
+++ b/docs/model_recipes.rst
@@ -58,8 +58,8 @@ Wagtail routes requests by iterating over the path components (separated with a
                 # find a matching child or 404
                 try:
                     subpage = self.get_children().get(slug=child_slug)
-                    except Page.DoesNotExist:
-                raise Http404
+                except Page.DoesNotExist:
+                    raise Http404
 
                 # delegate further routing
                 return subpage.specific.route(request, remaining_components)
@@ -67,13 +67,16 @@ Wagtail routes requests by iterating over the path components (separated with a
             else:
                 # request is for this very page
                 if self.live:
-                    # use the serve() method to render the request if the page is published
-                    return self.serve(request)
+                    # Return a RouteResult that will tell Wagtail to call
+                    # this page's serve() method
+                    return RouteResult(self)
                 else:
                     # the page matches the request, but isn't published, so 404
                     raise Http404
 
-The contract is pretty simple. ``route()`` takes the current object (``self``), the ``request`` object, and a list of the remaining ``path_components`` from the request URL. It either continues delegating routing by calling ``route()`` again on one of its children in the Wagtail tree, or ends the routing process by serving something -- either normally through the ``self.serve()`` method or by raising a 404 error.
+``route()`` takes the current object (``self``), the ``request`` object, and a list of the remaining ``path_components`` from the request URL. It either continues delegating routing by calling ``route()`` again on one of its children in the Wagtail tree, or ends the routing process by returning a ``RouteResult`` object or raising a 404 error.
+
+The ``RouteResult`` object (defined in wagtail.wagtailcore.url_routing) encapsulates all the information Wagtail needs to call a page's ``serve()`` method and return a final response: this information consists of the page object, and any additional args / kwargs to be passed to ``serve()``.
 
 By overriding the ``route()`` method, we could create custom endpoints for each object in the Wagtail tree. One use case might be using an alternate template when encountering the ``print/`` endpoint in the path. Another might be a REST API which interacts with the current object. Just to see what's involved, lets make a simple model which prints out all of its child path components.
 
@@ -82,6 +85,7 @@ First, ``models.py``:
 .. code-block:: python
 
     from django.shortcuts import render
+    from wagtail.wagtailcore.url_routing import RouteResult
 
     ...
 
@@ -89,15 +93,20 @@ First, ``models.py``:
   
         def route(self, request, path_components):
             if path_components:
-                return render(request, self.template, {
-                    'self': self,
-                    'echo': ' '.join(path_components),
-                })
+                # tell Wagtail to call self.serve() with an additional 'path_components' kwarg
+                return RouteResult(self, kwargs={'path_components': path_components})
             else:
                 if self.live:
-                    return self.serve(request)
-            else:
-                raise Http404
+                    # tell Wagtail to call self.serve() with no further args
+                    return RouteResult(self)
+                else:
+                    raise Http404
+
+        def serve(self, path_components=[]):
+            render(request, self.template, {
+                'self': self,
+                'echo': ' '.join(path_components),
+            })
 
     Echoer.content_panels = [
         FieldPanel('title', classname="full title"),
@@ -107,7 +116,7 @@ First, ``models.py``:
         MultiFieldPanel(COMMON_PANELS, "Common page configuration"),
     ]
 
-This model, ``Echoer``, doesn't define any properties, but does subclass ``Page`` so objects will be able to have a custom title and slug. The template just has to display our ``{{ echo }}`` property. We're skipping the ``serve()`` method entirely, but you could include your render code there to stay consistent with Wagtail's conventions.
+This model, ``Echoer``, doesn't define any properties, but does subclass ``Page`` so objects will be able to have a custom title and slug. The template just has to display our ``{{ echo }}`` property.
 
 Now, once creating a new ``Echoer`` page in the Wagtail admin titled "Echo Base," requests such as::
 
@@ -117,6 +126,12 @@ Will return::
 
     tauntaun kennel bed and breakfast
 
+Be careful if you're introducing new required arguments to the ``serve()`` method - Wagtail still needs to be able to display a default view of the page for previewing and moderation, and by default will attempt to do this by calling ``serve()`` with a request object and no further arguments. If your ``serve()`` method does not accept that as a method signature, you will need to override the page's ``serve_preview()`` method to call ``serve()`` with suitable arguments:
+
+.. code-block:: python
+
+    def serve_preview(self, request, mode_name):
+        return self.serve(request, color='purple')
 
 .. _tagging:
 

From 4fde40df9230ea4f2dacefbcda87f931518e3c79 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 4 Jul 2014 18:24:01 +0100
Subject: [PATCH 094/154] Update example in static_site_generation docs to use
 new-style route API

---
 docs/static_site_generation.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/static_site_generation.rst b/docs/static_site_generation.rst
index 9feb59c36..d6b598520 100644
--- a/docs/static_site_generation.rst
+++ b/docs/static_site_generation.rst
@@ -45,6 +45,8 @@ For example, let's say we have a Blog Index which uses pagination. We can overri
 
 .. code:: python
 
+    from wagtail.wagtailcore.url_routing import RouteResult
+
     class BlogIndex(Page):
         ...
 
@@ -54,7 +56,7 @@ For example, let's say we have a Blog Index which uses pagination. We can overri
         def route(self, request, path_components):
             if self.live and len(path_components) == 2 and path_components[0] == 'page':
                 try:
-                    return self.serve(request, page=int(path_components[1]))
+                    return RouteResult(self, kwargs={'page': int(path_components[1])})
                 except (TypeError, ValueError):
                     pass
 

From 383ce75b398e3d7f6f496d02990ac954a48db1a0 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 4 Jul 2014 19:22:57 +0100
Subject: [PATCH 095/154] Document the before_serve_page hook

---
 docs/editing_api.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/editing_api.rst b/docs/editing_api.rst
index 5113eb3b8..615175c08 100644
--- a/docs/editing_api.rst
+++ b/docs/editing_api.rst
@@ -402,6 +402,23 @@ Registering functions with a Wagtail hook follows the following pattern:
 
 Where ``'hook'`` is one of the following hook strings and ``function`` is a function you've defined to handle the hook.
 
+.. _before_serve_page:
+
+``before_serve_page``
+  .. versionadded:: 0.4
+
+  Called when Wagtail is about to serve a page. The callable passed into the hook will receive the page object, the request object, and the args and kwargs that will be passed to the page's ``serve()`` method. If the callable returns an ``HttpResponse``, that response will be returned immediately to the user, and Wagtail will not proceed to call ``serve()`` on the page.
+
+  .. code-block:: python
+
+    from wagtail.wagtailcore import hooks
+
+    def block_googlebot(page, request, serve_args, serve_kwargs):
+        if request.META.get('HTTP_USER_AGENT') == 'GoogleBot':
+            return HttpResponse("<h1>bad googlebot no cookie</h1>")
+
+    hooks.register('before_serve_page', block_googlebot)
+
 .. _construct_wagtail_edit_bird:
 
 ``construct_wagtail_edit_bird``

From 466df9ffd6e1c7ba4eedaf5bf418289aea71ce02 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 4 Jul 2014 20:51:39 +0100
Subject: [PATCH 096/154] Add developer docs for private pages

---
 docs/index.rst         |  1 +
 docs/private_pages.rst | 64 ++++++++++++++++++++++++++++++++++++++++++
 docs/settings.rst      | 10 +++++++
 3 files changed, 75 insertions(+)
 create mode 100644 docs/private_pages.rst

diff --git a/docs/index.rst b/docs/index.rst
index ae2300556..f51a4edf2 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,6 +20,7 @@ It supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 suppo
    deploying
    performance
    static_site_generation
+   private_pages
    management_commands
    contributing
    support
diff --git a/docs/private_pages.rst b/docs/private_pages.rst
new file mode 100644
index 000000000..bfd20ee09
--- /dev/null
+++ b/docs/private_pages.rst
@@ -0,0 +1,64 @@
+.. _private_pages:
+
+Private pages
+=============
+
+Users with publish permission on a page can set it to be private by clicking the 'Privacy' control in the top right corner of the page explorer or editing interface, and setting a password. Users visiting this page, or any of its subpages, will be prompted to enter a password before they can view the page.
+
+Private pages work on Wagtail out of the box - the site implementer does not need to do anything to set them up. However, the default "password required" form is only a bare-bones HTML page, and site implementers may wish to replace this with a page customised to their site design.
+
+Setting up a global "password required" page
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+By setting ``PASSWORD_REQUIRED_TEMPLATE`` in your Django settings file, you can specify the path of a template which will be used for all "password required" forms on the site (except for page types that specifically override it - see below):
+
+.. code-block:: python
+
+  PASSWORD_REQUIRED_TEMPLATE = 'myapp/password_required.html'
+
+This template will receive the same set of context variables that the blocked page would pass to its own template via ``get_context()`` - including ``self`` to refer to the page object itself - plus the following additional variables (which override any of the page's own context variables of the same name):
+
+ - **form** - A Django form object for the password prompt; this will contain a field named ``password`` as its only visible field. A number of hidden fields may also be present, so the page must loop over ``form.hidden_fields`` if not using one of Django's rendering helpers such as ``form.as_p``.
+ - **action_url** - The URL that the password form should be submitted to, as a POST request.
+
+A basic template suitable for use as PASSWORD_REQUIRED_TEMPLATE might look like this:
+
+ .. code-block:: django
+
+    <!DOCTYPE HTML>
+    <html>
+        <head>
+            <title>Password required</title>
+        </head>
+        <body>
+            <h1>Password required</h1>
+            <p>You need a password to access this page.</p>
+            <form action="{{ action_url }}" method="POST">
+                {% csrf_token %}
+
+                {{ form.non_field_errors }}
+
+                <div>
+                    {{ form.password.errors }}
+                    {{ form.password.label_tag }}
+                    {{ form.password }}
+                </div>
+
+                {% for field in form.hidden_fields %}
+                    {{ field }}
+                {% endfor %}
+                <input type="submit" value="Continue" />
+            </form>
+        </body>
+    </html>
+
+Setting a "password required" page for a specific page type
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The attribute ``password_required_template`` can be defined on a page model to use a custom template for the "password required" view, for that page type only. For example, if a site had a page type for displaying embedded videos along with a description, it might choose to use a custom "password required" template that displays the video description as usual, but shows the password form in place of the video embed.
+
+ .. code-block:: python
+
+    class VideoPage(Page):
+        ...
+        password_required_template = 'video/password_required.html'
diff --git a/docs/settings.rst b/docs/settings.rst
index 018af5d01..712e3b254 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -246,6 +246,16 @@ Email Notifications
 Wagtail sends email notifications when content is submitted for moderation, and when the content is accepted or rejected. This setting lets you pick which email address these automatic notifications will come from. If omitted, Django will fall back to using the ``DEFAULT_FROM_EMAIL`` variable if set, and ``webmaster@localhost`` if not.
 
 
+Private Pages
+-------------
+
+.. code-block:: python
+
+  PASSWORD_REQUIRED_TEMPLATE = 'myapp/password_required.html'
+
+This is the path to the Django template which will be used to display the "password required" form when a user accesses a private page. For more details, see the :ref:`private_pages` documentation.
+
+
 Other Django Settings Used by Wagtail
 -------------------------------------
 

From e2040e8842721d32a3eb122933a4cf60199a4a52 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 4 Jul 2014 21:57:58 +0100
Subject: [PATCH 097/154] fix documentation syntax errors / warnings

---
 docs/building_your_site/frontenddevelopers.rst     |  6 ++++--
 docs/editing_api.rst                               | 10 ++++++----
 .../documents_images_snippets/index.rst            |  1 +
 .../documents_images_snippets/snippets.rst         |  3 +++
 docs/frontend_cache_purging.rst                    |  2 ++
 docs/gettingstarted.rst                            | 12 ++++++------
 docs/index.rst                                     |  2 ++
 docs/management_commands.rst                       |  4 ++--
 docs/settings.rst                                  | 14 +++-----------
 docs/sitemap_generation.rst                        |  2 ++
 docs/wagtail_search.rst                            |  2 +-
 11 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index 35aa1c845..a3ba8eaa2 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -192,9 +192,10 @@ More control over the ``img`` tag
 
 Wagtail provides two shorcuts to give greater control over the ``img`` element:
 
-.. versionadded:: 0.4
 **Adding attributes to the  {% image %} tag**
 
+.. versionadded:: 0.4
+
 Extra attributes can be specified with the syntax ``attribute="value"``:
 
 .. code-block:: django
@@ -215,10 +216,11 @@ Wagtail can assign the image data to another object using Django's ``as`` syntax
     <img src="{{ tmp_photo.src }}" width="{{ tmp_photo.width }}" 
         height="{{ tmp_photo.height }}" alt="{{ tmp_photo.alt }}" class="my-custom-class" />
 
-.. versionadded:: 0.4
 The ``attrs`` shortcut
 -----------------------
 
+.. versionadded:: 0.4
+
 You can also use the ``attrs`` property as a shorthand to output the ``src``, ``width``, ``height`` and ``alt`` attributes in one go:
 
 .. code-block:: django
diff --git a/docs/editing_api.rst b/docs/editing_api.rst
index 5113eb3b8..a12d883d3 100644
--- a/docs/editing_api.rst
+++ b/docs/editing_api.rst
@@ -1,6 +1,6 @@
 
 Defining models with the Editing API
-===========
+====================================
 
 .. note::
     This documentation is currently being written.
@@ -251,7 +251,7 @@ Field Customization
 
 By adding CSS classnames to your panel definitions or adding extra parameters to your field definitions, you can control much of how your fields will display in the Wagtail page editing interface. Wagtail's page editing interface takes much of its behavior from Django's admin, so you may find many options for customization covered there. (See `Django model field reference`_ ).
 
-.. _Django model field reference:https://docs.djangoproject.com/en/dev/ref/models/fields/
+.. _Django model field reference: https://docs.djangoproject.com/en/dev/ref/models/fields/
 
 
 Full-Width Input
@@ -374,7 +374,7 @@ For more on ``django-modelcluster``, visit `the django-modelcluster github proje
 Extending the WYSIWYG Editor (hallo.js)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To inject javascript into the Wagtail page editor, see the :ref:`insert_editor_js` hook. Once you have the hook in place and your hallo.js plugin loads into the Wagtail page editor, use the following Javascript to register the plugin with hallo.js.
+To inject javascript into the Wagtail page editor, see the :ref:`insert_editor_js <insert_editor_js>` hook. Once you have the hook in place and your hallo.js plugin loads into the Wagtail page editor, use the following Javascript to register the plugin with hallo.js.
 
 .. code-block:: javascript
 
@@ -565,7 +565,8 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func
 .. _construct_whitelister_element_rules:
 
 ``construct_whitelister_element_rules``
-  .. versionadded:: 0.4
+.. versionadded:: 0.4
+
   Customise the rules that define which HTML elements are allowed in rich text areas. By default only a limited set of HTML elements and attributes are whitelisted - all others are stripped out. The callables passed into this hook must return a dict, which maps element names to handler functions that will perform some kind of manipulation of the element. These handler functions receive the element as a `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/bs4/doc/>`_ Tag object.
 
   The ``wagtail.wagtailcore.whitelist`` module provides a few helper functions to assist in defining these handlers: ``allow_without_attributes``, a handler which preserves the element but strips out all of its attributes, and ``attribute_rule`` which accepts a dict specifying how to handle each attribute, and returns a handler function. This dict will map attribute names to either True (indicating that the attribute should be kept), False (indicating that it should be dropped), or a callable (which takes the initial attribute value and returns either a final value for the attribute, or None to drop the attribute).
@@ -593,6 +594,7 @@ On loading, Wagtail will search for any app with the file ``image_formats.py`` a
 As an example, add a "thumbnail" format:
 
 .. code-block:: python
+
   # image_formats.py
   from wagtail.wagtailimages.formats import Format, register_image_format
 
diff --git a/docs/editor_manual/documents_images_snippets/index.rst b/docs/editor_manual/documents_images_snippets/index.rst
index 13ceb039e..35817aa79 100644
--- a/docs/editor_manual/documents_images_snippets/index.rst
+++ b/docs/editor_manual/documents_images_snippets/index.rst
@@ -10,3 +10,4 @@ Wagtail allows you to manage all of your documents and images through their own
 
    documents
    images
+   snippets
diff --git a/docs/editor_manual/documents_images_snippets/snippets.rst b/docs/editor_manual/documents_images_snippets/snippets.rst
index dd9fbccc0..0dfa1fdad 100644
--- a/docs/editor_manual/documents_images_snippets/snippets.rst
+++ b/docs/editor_manual/documents_images_snippets/snippets.rst
@@ -1,6 +1,9 @@
 Snippets
 ~~~~~~~~
 
+.. note::
+	Documentation currently incomplete and in draft status
+
 .. UNSURE HOW TO WRITE THIS AS THE ADVERT EXAMPLE IN WAGTAIL DEMO IS NOT A PARTICULARLY HELPFUL USE CASE. 
 
 When creating a page on a website, it is a common occurance to want to add in a piece of content that already exists on another page. An example of this would be a person's contact details, or an advert that you want to simply show on every page of your site, without having to manually apply it.
diff --git a/docs/frontend_cache_purging.rst b/docs/frontend_cache_purging.rst
index 34a6fda50..c1b03624f 100644
--- a/docs/frontend_cache_purging.rst
+++ b/docs/frontend_cache_purging.rst
@@ -1,3 +1,5 @@
+.. _frontend_cache_purging:
+
 Frontend cache purging
 ======================
 
diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst
index de635256c..04905700e 100644
--- a/docs/gettingstarted.rst
+++ b/docs/gettingstarted.rst
@@ -40,7 +40,7 @@ Once you've experimented with the demo app and are ready to build your pages via
 On OS X
 ~~~~~~~
 
-Install `pip <http://pip.readthedocs.org/en/latest/installing.html>`_ and `virtualenvwrapper <http://virtualenvwrapper.readthedocs.org/en/latest/>`_ if you don't have them already. Then, in your terminal::
+Install `pip <http://pip.readthedocs.org/en/latest/installing.html>`__ and `virtualenvwrapper <http://virtualenvwrapper.readthedocs.org/en/latest/>`_ if you don't have them already. Then, in your terminal::
 
     mkvirtualenv wagtaildemo
     git clone https://github.com/torchbox/wagtaildemo.git
@@ -75,10 +75,10 @@ Wagtail instance available as the basis for your new site:
 	./manage.py runserver 0.0.0.0:8000
 
 -  This will make the app accessible on the host machine as
-`localhost:8111 <http://localhost:8111>`_ - you can access the Wagtail admin
-interface at `localhost:8111/admin <http://localhost:8111/admin>`_. The codebase
-is located on the host machine, exported to the VM as a shared folder; code
-editing and Git operations will generally be done on the host.
+   `localhost:8111 <http://localhost:8111>`_ - you can access the Wagtail admin
+   interface at `localhost:8111/admin <http://localhost:8111/admin>`_. The codebase
+   is located on the host machine, exported to the VM as a shared folder; code
+   editing and Git operations will generally be done on the host.
 
 Using Docker
 ~~~~~~~~~~~~
@@ -101,7 +101,7 @@ use the following steps:
 Required dependencies
 =====================
 
--  `pip <https://github.com/pypa/pip>`_
+-  `pip <https://github.com/pypa/pip>`__
 -  `libjpeg <http://ijg.org/>`_
 -  `libxml2 <http://xmlsoft.org/>`_
 -  `libxslt <http://xmlsoft.org/XSLT/>`_
diff --git a/docs/index.rst b/docs/index.rst
index ae2300556..d200f2bc1 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,6 +20,8 @@ It supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 suppo
    deploying
    performance
    static_site_generation
+   frontend_cache_purging
+   sitemap_generation
    management_commands
    contributing
    support
diff --git a/docs/management_commands.rst b/docs/management_commands.rst
index 3f77fc3ef..96cfe95c3 100644
--- a/docs/management_commands.rst
+++ b/docs/management_commands.rst
@@ -25,10 +25,10 @@ This command moves a selection of pages from one section of the tree to another.
 Options:
 
  - **from**
-  This is the **id** of the page to move pages from. All descendants of this page will be moved to the destination. After the operation is complete, this page will have no children.
+   This is the **id** of the page to move pages from. All descendants of this page will be moved to the destination. After the operation is complete, this page will have no children.
 
  - **to**
-  This is the **id** of the page to move pages to.
+   This is the **id** of the page to move pages to.
 
 update_index
 ------------
diff --git a/docs/settings.rst b/docs/settings.rst
index 018af5d01..66fc2de98 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -3,7 +3,7 @@
 Configuring Django for Wagtail
 ==============================
 
-To install Wagtail completely from scratch, create a new Django project and an app within that project. For instructions on these tasks, see `Writing your first Django app`_. Your project directory will look like the following::
+To install Wagtail completely from scratch, create a new Django project and an app within that project. For instructions on these tasks, see `Writing your first Django app <https://docs.djangoproject.com/en/dev/intro/tutorial01/>`_. Your project directory will look like the following::
 
   myproject/
       myproject/
@@ -19,13 +19,7 @@ To install Wagtail completely from scratch, create a new Django project and an a
           views.py
       manage.py
 
-From your app directory, you can safely remove ``admin.py`` and ``views.py``, since Wagtail will provide this functionality for your models. Configuring Django to load Wagtail involves adding modules and variables to ``settings.py`` and urlconfs to ``urls.py``. For a more complete view of what's defined in these files, see `Django Settings`_ and `Django URL Dispatcher`_. 
-
-.. _Writing your first Django app: https://docs.djangoproject.com/en/dev/intro/tutorial01/
-
-.. _Django Settings: https://docs.djangoproject.com/en/dev/topics/settings/
-
-.. _Django URL Dispatcher: https://docs.djangoproject.com/en/dev/topics/http/urls/
+From your app directory, you can safely remove ``admin.py`` and ``views.py``, since Wagtail will provide this functionality for your models. Configuring Django to load Wagtail involves adding modules and variables to ``settings.py`` and urlconfs to ``urls.py``. For a more complete view of what's defined in these files, see `Django Settings <https://docs.djangoproject.com/en/dev/topics/settings/>`__ and `Django URL Dispatcher <https://docs.djangoproject.com/en/dev/topics/http/urls/>`_. 
 
 What follows is a settings reference which skips many boilerplate Django settings. If you just want to get your Wagtail install up quickly without fussing with settings at the moment, see :ref:`complete_example_config`.
 
@@ -266,9 +260,7 @@ Other Django Settings Used by Wagtail
   TEMPLATE_CONTEXT_PROCESSORS
   USE_I18N
 
-For information on what these settings do, see `Django Settings`_.
-
-.. _Django Settings: https://docs.djangoproject.com/en/dev/ref/settings/
+For information on what these settings do, see `Django Settings <https://docs.djangoproject.com/en/dev/ref/settings/>`__.
 
 
 Search Signal Handlers
diff --git a/docs/sitemap_generation.rst b/docs/sitemap_generation.rst
index 9c6d50e48..203a423fb 100644
--- a/docs/sitemap_generation.rst
+++ b/docs/sitemap_generation.rst
@@ -1,3 +1,5 @@
+.. _sitemap_generation:
+
 Sitemap generation
 ==================
 
diff --git a/docs/wagtail_search.rst b/docs/wagtail_search.rst
index 6a77b06f3..4c0a1ac74 100644
--- a/docs/wagtail_search.rst
+++ b/docs/wagtail_search.rst
@@ -1,5 +1,5 @@
 
-.. _search:
+.. _wagtail_search:
 
 Search
 ======

From 92818ddbd6a99dfca583b3f461b381b4ed85e53f Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 09:40:36 +0100
Subject: [PATCH 098/154] Added failing test for #431

---
 .../tests/test_account_management.py          | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index 391baad9d..d7d905ac7 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -6,7 +6,7 @@ from django.contrib.auth.models import User, Group, Permission
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.core import mail
 
-from wagtail.tests.utils import WagtailTestUtils
+from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.wagtailusers.models import UserProfile
 
 
@@ -65,6 +65,25 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         # Check that the user was redirected to the dashboard
         self.assertRedirects(response, reverse('wagtailadmin_home'))
 
+    @unittest.expectedFailure
+    def test_logged_in_as_non_privilaged_user_doesnt_redirect(self):
+        """
+        This tests that if the user is logged in but hasn't got permission
+        to access the admin, they are not redirected to the admin
+
+        This tests issue #431
+        """
+        # Login as unprivilaged user
+        User.objects.create(username='unprivilaged', password='123')
+        self.client.login(username='unprivilaged', password='123')
+
+        # Get login page
+        response = self.client.get(reverse('wagtailadmin_login'))
+
+        # Check that the user recieved a login page and was not redirected
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'wagtailadmin/login.html')
+
     def test_logout(self):
         """
         This tests that the user can logout

From 135f6e45d7cb80bbe3d428b07bb2077e586301d0 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 09:48:26 +0100
Subject: [PATCH 099/154] TestAuthentication tests are now logged out by
 default

---
 .../tests/test_account_management.py          | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index d7d905ac7..81126752b 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -14,16 +14,10 @@ class TestAuthentication(TestCase, WagtailTestUtils):
     """
     This tests that users can login and logout of the admin interface
     """
-    def setUp(self):
-        self.login()
-
     def test_login_view(self):
         """
         This tests that the login view responds with a login page
         """
-        # Logout so we can test the login view
-        self.client.logout()
-
         # Get login page
         response = self.client.get(reverse('wagtailadmin_login'))
 
@@ -36,8 +30,8 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         This posts user credentials to the login view and checks that
         the user was logged in successfully
         """
-        # Logout so we can test the login view
-        self.client.logout()
+        # Create user to log in with
+        user = User.objects.create_superuser(username='test', email='test@email.com', password='password')
 
         # Post credentials to the login page
         post_data = {
@@ -59,6 +53,9 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         redirected to the admin dashboard if they try to access the login
         page
         """
+        # Login
+        self.login()
+
         # Get login page
         response = self.client.get(reverse('wagtailadmin_login'))
 
@@ -88,6 +85,9 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         """
         This tests that the user can logout
         """
+        # Login
+        self.login()
+
         # Get logout page
         response = self.client.get(reverse('wagtailadmin_logout'))
 
@@ -102,9 +102,6 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         This tests that a not logged in user is redirected to the
         login page
         """
-        # Logout
-        self.client.logout()
-
         # Get dashboard
         response = self.client.get(reverse('wagtailadmin_home'))
 
@@ -117,9 +114,6 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         redirects to the correct place when the user has not set
         the LOGIN_URL setting correctly
         """
-        # Logout
-        self.client.logout()
-
         # Get dashboard with default LOGIN_URL setting
         with self.settings(LOGIN_URL='django.contrib.auth.views.login'):
             response = self.client.get(reverse('wagtailadmin_home'))

From 90bdd0c501cf52a29896c235b56b9d0ed38f2f23 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 09:49:18 +0100
Subject: [PATCH 100/154] Check that the user has permission to see the admin
 dashboard before redirecting them there. Fixes #431

---
 wagtail/wagtailadmin/tests/test_account_management.py | 3 +--
 wagtail/wagtailadmin/views/account.py                 | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index 81126752b..f99213859 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -6,7 +6,7 @@ from django.contrib.auth.models import User, Group, Permission
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.core import mail
 
-from wagtail.tests.utils import unittest, WagtailTestUtils
+from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailusers.models import UserProfile
 
 
@@ -62,7 +62,6 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         # Check that the user was redirected to the dashboard
         self.assertRedirects(response, reverse('wagtailadmin_home'))
 
-    @unittest.expectedFailure
     def test_logged_in_as_non_privilaged_user_doesnt_redirect(self):
         """
         This tests that if the user is logged in but hasn't got permission
diff --git a/wagtail/wagtailadmin/views/account.py b/wagtail/wagtailadmin/views/account.py
index 65e8dbeec..9dfa15b9e 100644
--- a/wagtail/wagtailadmin/views/account.py
+++ b/wagtail/wagtailadmin/views/account.py
@@ -75,7 +75,7 @@ def notification_preferences(request):
 @sensitive_post_parameters()
 @never_cache
 def login(request):
-    if request.user.is_authenticated():
+    if request.user.is_authenticated() and request.user.has_perm('wagtailadmin.access_admin'):
         return redirect('wagtailadmin_home')
     else:
         return auth_login(request,

From 895a898c0e80438154e084b59cdec44f0206558c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 10:21:53 +0100
Subject: [PATCH 101/154] privilaged => privileged

---
 wagtail/wagtailadmin/tests/test_account_management.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py
index f99213859..048ef6fbc 100644
--- a/wagtail/wagtailadmin/tests/test_account_management.py
+++ b/wagtail/wagtailadmin/tests/test_account_management.py
@@ -62,16 +62,16 @@ class TestAuthentication(TestCase, WagtailTestUtils):
         # Check that the user was redirected to the dashboard
         self.assertRedirects(response, reverse('wagtailadmin_home'))
 
-    def test_logged_in_as_non_privilaged_user_doesnt_redirect(self):
+    def test_logged_in_as_non_privileged_user_doesnt_redirect(self):
         """
         This tests that if the user is logged in but hasn't got permission
         to access the admin, they are not redirected to the admin
 
         This tests issue #431
         """
-        # Login as unprivilaged user
-        User.objects.create(username='unprivilaged', password='123')
-        self.client.login(username='unprivilaged', password='123')
+        # Login as unprivileged user
+        User.objects.create(username='unprivileged', password='123')
+        self.client.login(username='unprivileged', password='123')
 
         # Get login page
         response = self.client.get(reverse('wagtailadmin_login'))

From a1e641215d5255a42a7dfb7d3fd0e6f254e034cb Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 10:51:00 +0100
Subject: [PATCH 102/154] Allow search frontend urls to be imported from
 wagtailsearch.urls

When editors picks is merged, I plan to move 'wagtailsearch.frontend.urls' to 'wagtailsearch.urls'

This commit adds forwards-compatibility for this change
---
 wagtail/tests/urls.py                  | 4 ++--
 wagtail/wagtailsearch/urls/__init__.py | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py
index 385d0e6cf..c9ca98bba 100644
--- a/wagtail/tests/urls.py
+++ b/wagtail/tests/urls.py
@@ -3,13 +3,13 @@ from django.conf.urls import patterns, include, url
 from wagtail.wagtailcore import urls as wagtail_urls
 from wagtail.wagtailadmin import urls as wagtailadmin_urls
 from wagtail.wagtaildocs import urls as wagtaildocs_urls
-from wagtail.wagtailsearch.urls import frontend as wagtailsearch_frontend_urls
+from wagtail.wagtailsearch import urls as wagtailsearch_urls
 from wagtail.contrib.wagtailsitemaps.views import sitemap
 
 
 urlpatterns = patterns('',
     url(r'^admin/', include(wagtailadmin_urls)),
-    url(r'^search/', include(wagtailsearch_frontend_urls)),
+    url(r'^search/', include(wagtailsearch_urls)),
     url(r'^documents/', include(wagtaildocs_urls)),
 
     url(r'^sitemap\.xml$', sitemap),
diff --git a/wagtail/wagtailsearch/urls/__init__.py b/wagtail/wagtailsearch/urls/__init__.py
index e69de29bb..faba126e7 100644
--- a/wagtail/wagtailsearch/urls/__init__.py
+++ b/wagtail/wagtailsearch/urls/__init__.py
@@ -0,0 +1 @@
+from wagtail.wagtailsearch.urls.frontend import urlpatterns

From 17b564de405e57a8500498894daca7cbc21e58fc Mon Sep 17 00:00:00 2001
From: Chris Rogers <chrxr@hotmail.co.uk>
Date: Tue, 8 Jul 2014 12:29:15 +0100
Subject: [PATCH 103/154] Update conf.py

---
 docs/conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 11517ada2..3452772bc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -59,9 +59,9 @@ copyright = u'2014, Torchbox'
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+version = '0.3.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.1'
+release = '0.3.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 7286692c39d431573a12e7472dbd4ea9b7af4144 Mon Sep 17 00:00:00 2001
From: Chris Rogers <chrxr@hotmail.co.uk>
Date: Tue, 8 Jul 2014 12:31:13 +0100
Subject: [PATCH 104/154] Update conf.py

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3452772bc..ba6525d1b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Wagtail Documentation'
+project = u'Wagtail'
 copyright = u'2014, Torchbox'
 
 # The version info for the project you're documenting, acts as replacement for

From 3a9cb569d806745ef4a9b612d4dc638ecb209080 Mon Sep 17 00:00:00 2001
From: Neal Todd <neal.todd@torchbox.com>
Date: Tue, 8 Jul 2014 13:16:55 +0100
Subject: [PATCH 105/154] Python 2/3 code contribution docs.

---
 README.rst            | 3 ++-
 docs/contributing.rst | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index f0dc14abf..83dc25f9d 100644
--- a/README.rst
+++ b/README.rst
@@ -55,7 +55,8 @@ Contributing
 ~~~~~~~~~~~~
 If you're a Python or Django developer, fork the repo and get stuck in!
 
-We suggest you start by checking the `Help develop me! <https://github.com/torchbox/wagtail/issues?labels=Help+develop+me%21>`_ label.
+We suggest you start by checking the `Help develop me! <https://github.com/torchbox/wagtail/issues?labels=Help+develop+me%21>`_ label, and the `coding guidelines <http://wagtail.readthedocs.org/en/latest/contributing.html#coding-guidelines>`_.
 
 Send us a useful pull request and we'll post you a `t-shirt <https://twitter.com/WagtailCMS/status/432166799464210432/photo/1>`_.
 
+We also welcome `translations <http://wagtail.readthedocs.org/en/latest/contributing.html#translations>`_ for Wagtail's interface.
diff --git a/docs/contributing.rst b/docs/contributing.rst
index f5eb168b2..40f88ccd5 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -15,6 +15,7 @@ Coding guidelines
 ~~~~~~~~~~~~~~~~~
 
 * PEP8. We ask that all Python contributions adhere to the `PEP8 <http://www.python.org/dev/peps/pep-0008/>`_ style guide, apart from the restriction on line length (E501). The `pep8 tool <http://pep8.readthedocs.org/en/latest/>`_ makes it easy to check your code, e.g. ``pep8 --ignore=E501 your_file.py``.
+* Python 2 and 3 compatibility. All Python contributions should support python 2 and 3 and recommend using the `six <https://pythonhosted.org/six/>`_ compatibility library (use the pip version installed as a dependency, not the version bundled with Django).
 * Tests. Wagtail has a suite of tests, which we are committed to improving and expanding. We run continuous integration at `travis-ci.org/torchbox/wagtail <https://travis-ci.org/torchbox/wagtail>`_ to ensure that no commits or pull requests introduce test failures. If your contributions add functionality to Wagtail, please include the additional tests to cover it; if your contributions alter existing functionality, please update the relevant tests accordingly.
 
 Styleguide

From 49b72d2481efb0b13b7a97d9a18e635bc4426b65 Mon Sep 17 00:00:00 2001
From: Neal Todd <neal.todd@torchbox.com>
Date: Tue, 8 Jul 2014 13:21:44 +0100
Subject: [PATCH 106/154] Text amendments.

---
 README.rst            | 2 +-
 docs/contributing.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 83dc25f9d..5fa7f47f9 100644
--- a/README.rst
+++ b/README.rst
@@ -55,7 +55,7 @@ Contributing
 ~~~~~~~~~~~~
 If you're a Python or Django developer, fork the repo and get stuck in!
 
-We suggest you start by checking the `Help develop me! <https://github.com/torchbox/wagtail/issues?labels=Help+develop+me%21>`_ label, and the `coding guidelines <http://wagtail.readthedocs.org/en/latest/contributing.html#coding-guidelines>`_.
+We suggest you start by checking the `Help develop me! <https://github.com/torchbox/wagtail/issues?labels=Help+develop+me%21>`_ label and the `coding guidelines <http://wagtail.readthedocs.org/en/latest/contributing.html#coding-guidelines>`_.
 
 Send us a useful pull request and we'll post you a `t-shirt <https://twitter.com/WagtailCMS/status/432166799464210432/photo/1>`_.
 
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 40f88ccd5..797176997 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -15,7 +15,7 @@ Coding guidelines
 ~~~~~~~~~~~~~~~~~
 
 * PEP8. We ask that all Python contributions adhere to the `PEP8 <http://www.python.org/dev/peps/pep-0008/>`_ style guide, apart from the restriction on line length (E501). The `pep8 tool <http://pep8.readthedocs.org/en/latest/>`_ makes it easy to check your code, e.g. ``pep8 --ignore=E501 your_file.py``.
-* Python 2 and 3 compatibility. All Python contributions should support python 2 and 3 and recommend using the `six <https://pythonhosted.org/six/>`_ compatibility library (use the pip version installed as a dependency, not the version bundled with Django).
+* Python 2 and 3 compatibility. All contributions should support Python 2 and 3 and we recommend using the `six <https://pythonhosted.org/six/>`_ compatibility library (use the pip version installed as a dependency, not the version bundled with Django).
 * Tests. Wagtail has a suite of tests, which we are committed to improving and expanding. We run continuous integration at `travis-ci.org/torchbox/wagtail <https://travis-ci.org/torchbox/wagtail>`_ to ensure that no commits or pull requests introduce test failures. If your contributions add functionality to Wagtail, please include the additional tests to cover it; if your contributions alter existing functionality, please update the relevant tests accordingly.
 
 Styleguide

From a67fdf2423ae83d8698832d54885882ca645833c Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 13:26:08 +0100
Subject: [PATCH 107/154] Early draft of 0.4 release notes

---
 docs/releases/0.4.rst | 135 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 docs/releases/0.4.rst

diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
new file mode 100644
index 000000000..56a9751e5
--- /dev/null
+++ b/docs/releases/0.4.rst
@@ -0,0 +1,135 @@
+=========================
+Wagtail 0.4 release notes
+=========================
+
+
+Whats new
+=========
+
+Front-end permissions
+~~~~~~~~~~~~~~~~~~~~~
+
+TODO
+
+
+Python 3 support
+~~~~~~~~~~~~~~~~
+
+Wagtail now supports Python 3.2, 3.3 and 3.4.
+
+
+Scheduled publishing
+~~~~~~~~~~~~~~~~~~~~
+
+Editors can now schedule pages to be published or unpublished at specified times.
+
+A new management command has been added (``publish_scheduled_pages``) to publish pages that have been scheduled by an Editor.
+
+TODO: Link to docs
+
+
+Search on QuerySet with Elasticsearch
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Its now possible to perform searches with Elasticsearch on ``PageQuerySet``s.
+
+Example:
+
+    >>> from wagtail.wagtailcore.models import Page
+    >>> Page.objects.live().descendant_of(events_index).search("Hello")
+    [<Page: Event 1>, <Page: Event 2>]
+
+
+
+Sitemap generation
+~~~~~~~~~~~~~~~~~~
+
+A new module has been added (``wagtail.contrib.wagtailsitemaps``) which produces XML sitemaps for Wagtail sites.
+
+TODO: Link to docs
+
+
+Front-end cache invalidation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A new module has been added (``wagtail.contrib.wagtailfrontendcache``) which invalidates pages in a frontend cache when they are updated or deleted in Wagtail.
+
+TODO: Link to docs
+
+
+Notification preferences
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Users can now decide which notifications they recieve from Wagtail using a new "Notification preferences" section located in the accound settings section.
+
+
+Minor features
+~~~~~~~~~~~~~~
+
+Core
+----
+
+ * Any extra arguments given to ``Page.serve`` are now passed through to ``get_context`` and ``get_template``
+ * Added ``in_menu`` and ``not_in_menu`` methods to ``PageQuerySet``
+ * Added ``get_next_siblings`` and ``get_prev_siblings`` to ``Page``
+ * Added ``page_published`` signal
+ * Added ``copy`` method to ``Page`` to allow copying of pages
+ * Added ``construct_whitelister_element_rules`` hook for customising the HTML whitelist used when saving ``RichText`` fields
+ * Support for setting a ``subpage_types`` property on ``Page`` models, to define which page types are allowed as subpages
+
+
+Admin
+-----
+
+ * Removed the "More" section from the admin menu
+ * Added pagination to page listings in admin
+ * Added a new datetime picker widget
+ * Updated hallo.js to version 1.0.4
+ * Aesthetic improvements to preview experience
+ * Login screen redirects to dashboard if user is already logged in
+ * Snippets are now ordered alphabetically
+ * Added ``init_new_page`` signal
+
+
+Images
+------
+
+ * Added ``original`` as a resizing rule supported by the ``{% image %}`` tag
+ * ``image`` tag now accepts extra keyword arguments to be output as attributes on the img tag
+ * Added an ``attrs`` property to image rendition objects to output ``src``, ``width``, ``height`` and ``alt`` attributes all in one go
+
+
+Other
+-----
+ * Added styleguide (mainly for wagtail developers)
+
+
+Bug fixes
+~~~~~~~~~
+
+ * Animated GIFs are now coalesced before resizing
+ * Wand backend clones images before modifying them
+ * Admin breadcrumb now positioned correctly on mobile
+ * Page chooser breadcrumb now updates the chooser modal instead of linking to Explorer
+ * Embeds - Fixed crash when no HTML field is sent back from the embed provider
+ * Multiple sites with same hostname but different ports are now allowed
+ * No longer possible to create multiple sites with ``is_default_site = True``
+
+
+Backwards incompatible changes
+==============================
+
+ElasticUtils/pyelasticsearch has now been replaced with elasticsearch-py
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TODO
+
+
+Deprecated features
+===================
+
+ * Renamed some template tag libraries
+
+TODO: Write some more about renamed template tags
+
+TODO: Search wagtail codebase for any new DeprecationWarnings

From 1274a81e8df5908ec03b89db51d37f717eefa5cb Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 13:55:19 +0100
Subject: [PATCH 108/154] Updates to release notes

---
 docs/releases/0.4.rst | 51 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index 56a9751e5..85b325f40 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -6,6 +6,7 @@ Wagtail 0.4 release notes
 Whats new
 =========
 
+
 Front-end permissions
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -31,16 +32,13 @@ TODO: Link to docs
 Search on QuerySet with Elasticsearch
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Its now possible to perform searches with Elasticsearch on ``PageQuerySet``s.
-
-Example:
+Its now possible to perform searches with Elasticsearch on ``PageQuerySet``s:
 
     >>> from wagtail.wagtailcore.models import Page
     >>> Page.objects.live().descendant_of(events_index).search("Hello")
     [<Page: Event 1>, <Page: Event 2>]
 
 
-
 Sitemap generation
 ~~~~~~~~~~~~~~~~~~
 
@@ -66,6 +64,7 @@ Users can now decide which notifications they recieve from Wagtail using a new "
 Minor features
 ~~~~~~~~~~~~~~
 
+
 Core
 ----
 
@@ -119,6 +118,7 @@ Bug fixes
 Backwards incompatible changes
 ==============================
 
+
 ElasticUtils/pyelasticsearch has now been replaced with elasticsearch-py
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -128,8 +128,45 @@ TODO
 Deprecated features
 ===================
 
- * Renamed some template tag libraries
 
-TODO: Write some more about renamed template tags
+Template tag libraries renamed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-TODO: Search wagtail codebase for any new DeprecationWarnings
+The following template tag libraries have been renamed:
+
+ * ``pageurl`` => ``wagtailcore_tags``
+ * ``rich_text`` => ``wagtailcore_tags``
+ * ``embed_filters`` => ``wagtailembeds_tags``
+ * ``image_tags`` => ``wagtailimages_tags``
+
+
+New search field configuration format
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``indexed_fields`` is now deprecated and has been replaced by a new search field configuration format called ``search_fields``.
+
+TODO: Needs docs!
+
+
+Page.route method should now return a RouteResult instead of an HttpResponse
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TODO
+
+
+Hooks have been moved into wagtailcore
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TODO
+
+
+Page.show_as_mode renamed to Page.serve_preview
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TODO
+
+
+Page.get_other_siblings deprecated
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Please use ``my_page.get_siblings(inclusive=False)`` instead.

From 89e4d2697837127c42688eacfc35c8fd7116336f Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 14:17:10 +0100
Subject: [PATCH 109/154] More updates to 0.4 release notes

---
 docs/releases/0.4.rst | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index 85b325f40..f2eb290f5 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -10,7 +10,9 @@ Whats new
 Front-end permissions
 ~~~~~~~~~~~~~~~~~~~~~
 
-TODO
+Wagtail now supports password protecting pages on the frontend allowing sections of your website to be made private.
+
+TODO: Link to docs
 
 
 Python 3 support
@@ -80,8 +82,8 @@ Core
 Admin
 -----
 
- * Removed the "More" section from the admin menu
- * Added pagination to page listings in admin
+ * Removed the "More" section from the menu
+ * Added pagination to page listings
  * Added a new datetime picker widget
  * Updated hallo.js to version 1.0.4
  * Aesthetic improvements to preview experience
@@ -119,10 +121,15 @@ Backwards incompatible changes
 ==============================
 
 
-ElasticUtils/pyelasticsearch has now been replaced with elasticsearch-py
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ElasticUtils replaced with elasticsearch-py
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-TODO
+If you are using the elasticsearch backend, you must install the ``elasticsearch`` module into your environment.
+
+
+.. note::
+
+    If you are using an older version of Elasticsearch (< 1.0) you must install elasticsearch-py 0.4.x.
 
 
 Deprecated features
@@ -143,25 +150,29 @@ The following template tag libraries have been renamed:
 New search field configuration format
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The ``indexed_fields`` is now deprecated and has been replaced by a new search field configuration format called ``search_fields``.
+``indexed_fields`` is now deprecated and has been replaced by a new search field configuration format called ``search_fields``.
 
 TODO: Needs docs!
 
 
-Page.route method should now return a RouteResult instead of an HttpResponse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Page.route method should now return a RouteResult
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-TODO
+Previously, the ``route`` method called ``serve`` and returned a ``HttpResponse`` object. This has now been split up so ``serve`` is called separately and ``route`` must now return a RouteResult object.
+
+TODO: Link to docs
 
 
-Hooks have been moved into wagtailcore
+Wagtailadmins ``hooks`` module has moved to wagtailcore
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-TODO
+If you use any ``wagtail_hooks.py`` files in your project, you may have an import like: ``from wagtail.wagtailadmin import hooks``
+
+Change this to: ``from wagtail.wagtailcore import hooks``
 
 
 Page.show_as_mode renamed to Page.serve_preview
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 TODO
 

From 491a10f6a0907511edfe07ec06f4363551245276 Mon Sep 17 00:00:00 2001
From: Tom Dyson <tom@torchbox.com>
Date: Tue, 8 Jul 2014 14:18:24 +0100
Subject: [PATCH 110/154] eeking -> eking

See http://www.oxforddictionaries.com/definition/english/eke
---
 docs/performance.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/performance.rst b/docs/performance.rst
index 2f4a834e0..09f06be0f 100644
--- a/docs/performance.rst
+++ b/docs/performance.rst
@@ -1,7 +1,7 @@
 Performance
 ===========
 
-Wagtail is designed for speed, both in the editor interface and on the front-end, but if you want even better performance or you need to handle very high volumes of traffic, here are some tips on eeking out the most from your installation.
+Wagtail is designed for speed, both in the editor interface and on the front-end, but if you want even better performance or you need to handle very high volumes of traffic, here are some tips on eking out the most from your installation.
 
 Editor interface
 ~~~~~~~~~~~~~~~~
@@ -41,4 +41,4 @@ Public users
 Caching proxy
 -------------
 
-To support high volumes of traffic with excellent response times, we recommend a caching proxy. Both `Varnish <http://www.varnish-cache.org/>`_ and `Squid <http://www.squid-cache.org/>`_ have been tested in production. Hosted proxies like `Cloudflare <https://www.cloudflare.com/>`_ should also work well.
\ No newline at end of file
+To support high volumes of traffic with excellent response times, we recommend a caching proxy. Both `Varnish <http://www.varnish-cache.org/>`_ and `Squid <http://www.squid-cache.org/>`_ have been tested in production. Hosted proxies like `Cloudflare <https://www.cloudflare.com/>`_ should also work well.

From 67fbf86bd111facf35a8372c9cf0e1523ce90f64 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 14:43:49 +0100
Subject: [PATCH 111/154] Added links to docs from 0.4 release notes

---
 docs/building_your_site/djangodevelopers.rst |  2 ++
 docs/management_commands.rst                 | 17 ++++++++++++++
 docs/releases/0.4.rst                        | 24 ++++++++------------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/docs/building_your_site/djangodevelopers.rst b/docs/building_your_site/djangodevelopers.rst
index 89f0ed642..ee066b99a 100644
--- a/docs/building_your_site/djangodevelopers.rst
+++ b/docs/building_your_site/djangodevelopers.rst
@@ -171,6 +171,8 @@ Other Relationships
 Your ``Page``-derived models might have other interrelationships which extend the basic Wagtail tree or depart from it entirely. You could provide functions to navigate between siblings, such as a "Next Post" link on a blog page (``post->post->post``). It might make sense for subtrees to interrelate, such as in a discussion forum (``forum->post->replies``) Skipping across the hierarchy might make sense, too, as all objects of a certain model class might interrelate regardless of their ancestors (``events = EventPage.objects.all``). It's largely up to the models to define their interrelations, the possibilities are really endless.
 
 
+.. _anatomy_of_a_wagtail_request:
+
 Anatomy of a Wagtail Request
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/management_commands.rst b/docs/management_commands.rst
index 96cfe95c3..18358a869 100644
--- a/docs/management_commands.rst
+++ b/docs/management_commands.rst
@@ -1,6 +1,11 @@
+.. _management_commands:
+
 Management commands
 ===================
 
+
+.. _publish_scheduled_pages:
+
 publish_scheduled_pages
 -----------------------
 
@@ -8,6 +13,9 @@ publish_scheduled_pages
 
 This command publishes or unpublishes pages that have had these actions scheduled by an editor. It is recommended to run this command once an hour.
 
+
+.. _fixtree:
+
 fixtree
 -------
 
@@ -15,6 +23,9 @@ fixtree
 
 This command scans for errors in your database and attempts to fix any issues it finds.
 
+
+.. _move_pages:
+
 move_pages
 ----------
 
@@ -30,6 +41,9 @@ Options:
  - **to**
    This is the **id** of the page to move pages to.
 
+
+.. _update_index:
+
 update_index
 ------------
 
@@ -44,6 +58,9 @@ It is recommended to run this command once a week and at the following times:
 
 The search may not return any results while this command is running, so avoid running it at peak times.
 
+
+.. _search_garbage_collect:
+
 search_garbage_collect
 ----------------------
 
diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index f2eb290f5..1330603dc 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -7,12 +7,12 @@ Whats new
 =========
 
 
-Front-end permissions
-~~~~~~~~~~~~~~~~~~~~~
+Private Pages
+~~~~~~~~~~~~~
 
 Wagtail now supports password protecting pages on the frontend allowing sections of your website to be made private.
 
-TODO: Link to docs
+:ref:`private_pages`
 
 
 Python 3 support
@@ -26,9 +26,7 @@ Scheduled publishing
 
 Editors can now schedule pages to be published or unpublished at specified times.
 
-A new management command has been added (``publish_scheduled_pages``) to publish pages that have been scheduled by an Editor.
-
-TODO: Link to docs
+A new management command has been added (:ref:`publish_scheduled_pages`) to publish pages that have been scheduled by an Editor.
 
 
 Search on QuerySet with Elasticsearch
@@ -46,7 +44,7 @@ Sitemap generation
 
 A new module has been added (``wagtail.contrib.wagtailsitemaps``) which produces XML sitemaps for Wagtail sites.
 
-TODO: Link to docs
+:ref:`sitemap_generation`
 
 
 Front-end cache invalidation
@@ -54,7 +52,7 @@ Front-end cache invalidation
 
 A new module has been added (``wagtail.contrib.wagtailfrontendcache``) which invalidates pages in a frontend cache when they are updated or deleted in Wagtail.
 
-TODO: Link to docs
+:ref:`frontend_cache_purging`
 
 
 Notification preferences
@@ -129,7 +127,7 @@ If you are using the elasticsearch backend, you must install the ``elasticsearch
 
 .. note::
 
-    If you are using an older version of Elasticsearch (< 1.0) you must install elasticsearch-py 0.4.x.
+    If you are using an older version of Elasticsearch (< 1.0) you must install ``elasticsearch`` version 0.4.x.
 
 
 Deprecated features
@@ -152,15 +150,13 @@ New search field configuration format
 
 ``indexed_fields`` is now deprecated and has been replaced by a new search field configuration format called ``search_fields``.
 
-TODO: Needs docs!
-
 
 Page.route method should now return a RouteResult
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Previously, the ``route`` method called ``serve`` and returned a ``HttpResponse`` object. This has now been split up so ``serve`` is called separately and ``route`` must now return a RouteResult object.
 
-TODO: Link to docs
+:ref:`anatomy_of_a_wagtail_request`
 
 
 Wagtailadmins ``hooks`` module has moved to wagtailcore
@@ -171,8 +167,8 @@ If you use any ``wagtail_hooks.py`` files in your project, you may have an impor
 Change this to: ``from wagtail.wagtailcore import hooks``
 
 
-Page.show_as_mode renamed to Page.serve_preview
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Page.show_as_mode replaced with Page.serve_preview
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 TODO
 

From 608b8ccc4fa3240a92c9f3f8488ce656144dee28 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 14:54:26 +0100
Subject: [PATCH 112/154] Added 'Miscellaneous' section to deprecated features

---
 docs/releases/0.4.rst | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index 1330603dc..a2ac574da 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -151,8 +151,8 @@ New search field configuration format
 ``indexed_fields`` is now deprecated and has been replaced by a new search field configuration format called ``search_fields``.
 
 
-Page.route method should now return a RouteResult
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``Page.route`` method should now return a ``RouteResult``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Previously, the ``route`` method called ``serve`` and returned a ``HttpResponse`` object. This has now been split up so ``serve`` is called separately and ``route`` must now return a RouteResult object.
 
@@ -167,13 +167,9 @@ If you use any ``wagtail_hooks.py`` files in your project, you may have an impor
 Change this to: ``from wagtail.wagtailcore import hooks``
 
 
-Page.show_as_mode replaced with Page.serve_preview
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Miscellaneous
+~~~~~~~~~~~~~
 
-TODO
-
-
-Page.get_other_siblings deprecated
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Please use ``my_page.get_siblings(inclusive=False)`` instead.
+ * ``Page.show_as_mode``  replaced with ``Page.serve_preview``
+ * ``Page.get_page_modes`` method replaced with ``Page.preview_modes`` property
+ * ``Page.get_other_siblings`` replaced with ``Page.get_siblings(inclusive=False)``

From ff72d70d37dfd32e1a0e75e4d216eca555a719ff Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 8 Jul 2014 14:55:12 +0100
Subject: [PATCH 113/154] Fixed typo

---
 docs/releases/0.4.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index a2ac574da..a51c3402d 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -58,7 +58,7 @@ A new module has been added (``wagtail.contrib.wagtailfrontendcache``) which inv
 Notification preferences
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Users can now decide which notifications they recieve from Wagtail using a new "Notification preferences" section located in the accound settings section.
+Users can now decide which notifications they recieve from Wagtail using a new "Notification preferences" section located in the account settings.
 
 
 Minor features

From 95c76542163e816c19310953c61d8f59507ae78a Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 8 Jul 2014 20:25:54 +0100
Subject: [PATCH 114/154] Page.search should invoke backend.search with cls as
 a plain arg, not a 'model' kwarg

---
 wagtail/wagtailcore/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index 11b6fe7ec..c6a4f6854 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -521,7 +521,7 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, indexed.Index
 
         # Search
         s = get_search_backend()
-        return s.search(query_string, model=cls, fields=fields, filters=filters, prefetch_related=prefetch_related)
+        return s.search(query_string, cls, fields=fields, filters=filters, prefetch_related=prefetch_related)
 
     @classmethod
     def clean_subpage_types(cls):

From 354895bad2d1e5e40559d7e980a69e4a5895a315 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 09:28:05 +0100
Subject: [PATCH 115/154] Updated setup.py requirements

---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 6e0bc6949..11c32d522 100644
--- a/setup.py
+++ b/setup.py
@@ -25,9 +25,9 @@ PY3 = sys.version_info[0] == 3
 install_requires = [
     "Django>=1.6.2,<1.7",
     "South>=0.8.4",
-    "django-compressor>=1.3",
-    "django-libsass>=0.1",
-    "django-modelcluster>=0.1",
+    "django-compressor>=1.4",
+    "django-libsass>=0.2",
+    "django-modelcluster>=0.3",
     "django-taggit==0.11.2",
     "django-treebeard==2.0",
     "Pillow>=2.3.0",

From 1d9f792415c1ebd10f36758e72efff8ee1442bb2 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 09:50:58 +0100
Subject: [PATCH 116/154] Added search changes to changelog and 0.4 release
 notes

---
 CHANGELOG.txt         |  9 +++++++++
 docs/releases/0.4.rst | 14 ++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8f391a29a..e915ffb22 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -9,6 +9,7 @@ Changelog
  * Added frontend cache invalidator
  * Added sitemap generator
  * Added notification preferences
+ * Added a new way to configure searchable/filterable fields on models
  * Added 'original' as a resizing rule supported by the 'image' tag
  * Hallo.js updated to version 1.0.4
  * Snippets are now ordered alphabetically
@@ -29,6 +30,14 @@ Changelog
  * Added init_new_page signal
  * Added page_published signal
  * Added copy method to Page to allow copying of pages
+ * Added ``search`` method to ``PageQuerySet``
+ * Added ``get_indexed_objects`` allowing developers to customise which objects get added to the search index
+ * Major refactor of Elasticsearch backend
+ * Use ``match`` instead of ``query_string`` queries
+ * Fields are now indexed in Elasticsearch with their correct type
+ * Filter fields are no longer included in '_all' (in Elasticsearch)
+ * Fields with partial matching are now indexed together into '_partials'
+
  * Fix: Animated GIFs are now coalesced before resizing
  * Fix: Wand backend clones images before modifying them
  * Fix: Admin breadcrumb now positioned correctly on mobile
diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index a51c3402d..461689e05 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -70,6 +70,7 @@ Core
 
  * Any extra arguments given to ``Page.serve`` are now passed through to ``get_context`` and ``get_template``
  * Added ``in_menu`` and ``not_in_menu`` methods to ``PageQuerySet``
+ * Added ``search`` method to ``PageQuerySet``
  * Added ``get_next_siblings`` and ``get_prev_siblings`` to ``Page``
  * Added ``page_published`` signal
  * Added ``copy`` method to ``Page`` to allow copying of pages
@@ -90,6 +91,18 @@ Admin
  * Added ``init_new_page`` signal
 
 
+Search
+------
+
+ * Added a new way to configure searchable/filterable fields on models
+ * Added ``get_indexed_objects`` allowing developers to customise which objects get added to the search index
+ * Major refactor of Elasticsearch backend
+ * Use ``match`` instead of ``query_string`` queries
+ * Fields are now indexed in Elasticsearch with their correct type
+ * Filter fields are no longer included in '_all' (in Elasticsearch)
+ * Fields with partial matching are now indexed together into '_partials'
+
+
 Images
 ------
 
@@ -100,6 +113,7 @@ Images
 
 Other
 -----
+
  * Added styleguide (mainly for wagtail developers)
 
 

From 8aaff51b05e3cc781b89f6258166b6a58ba0295a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 09:52:33 +0100
Subject: [PATCH 117/154] Minor tweak to 0.4 release notes

---
 docs/releases/0.4.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index 461689e05..a53ca5463 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -99,7 +99,7 @@ Search
  * Major refactor of Elasticsearch backend
  * Use ``match`` instead of ``query_string`` queries
  * Fields are now indexed in Elasticsearch with their correct type
- * Filter fields are no longer included in '_all' (in Elasticsearch)
+ * Filter fields are no longer included in '_all'
  * Fields with partial matching are now indexed together into '_partials'
 
 

From 599eebf022a5b04cd7fcd30bfeec7dfbc4261693 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 14:30:39 +0100
Subject: [PATCH 118/154] Splitup wagtailsearch docs

---
 docs/index.rst                                |   2 +-
 docs/wagtailsearch/configuration.rst          |  77 +++++++++
 docs/wagtailsearch/editors_picks.rst          |  41 +++++
 .../frontend_views.rst}                       | 152 ++++--------------
 docs/wagtailsearch/index.rst                  |  15 ++
 5 files changed, 162 insertions(+), 125 deletions(-)
 create mode 100644 docs/wagtailsearch/configuration.rst
 create mode 100644 docs/wagtailsearch/editors_picks.rst
 rename docs/{wagtail_search.rst => wagtailsearch/frontend_views.rst} (53%)
 create mode 100644 docs/wagtailsearch/index.rst

diff --git a/docs/index.rst b/docs/index.rst
index 171c0e45a..b2d9a534d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,7 +13,7 @@ It supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 suppo
    building_your_site/index
    editing_api
    snippets
-   wagtail_search
+   wagtailsearch/index
    form_builder
    model_recipes
    advanced_topics
diff --git a/docs/wagtailsearch/configuration.rst b/docs/wagtailsearch/configuration.rst
new file mode 100644
index 000000000..765e81b84
--- /dev/null
+++ b/docs/wagtailsearch/configuration.rst
@@ -0,0 +1,77 @@
+
+.. _wagtailsearch_configuration:
+
+
+Wagtailsearch configuration
+============================
+
+
+Adding extra search fields
+--------------------------
+
+ - SearchField
+ - FilterField
+ - Callable search fields
+ - Indexing fields in child/related objects
+
+
+Indexing non-page models
+------------------------
+
+
+Search Backends
+---------------
+
+Wagtail can degrade to a database-backed text search, but we strongly recommend `Elasticsearch`_.
+
+.. _Elasticsearch: http://www.elasticsearch.org/
+
+
+Default DB Backend
+``````````````````
+The default DB search backend uses Django's ``__icontains`` filter.
+
+
+Elasticsearch Backend
+`````````````````````
+Prerequisites are the Elasticsearch service itself and, via pip, the `elasticsearch-py`_ package:
+
+.. code-block:: guess
+
+  pip install elasticsearch
+
+.. note::
+  If you are using Elasticsearch < 1.0, install elasticsearch-py version 0.4.5: ```pip install elasticsearch==0.4.5```
+
+The backend is configured in settings:
+
+.. code-block:: python
+
+  WAGTAILSEARCH_BACKENDS = {
+      'default': {
+          'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch',
+          'URLS': ['http://localhost:9200'],
+          'INDEX': 'wagtail',
+          'TIMEOUT': 5,
+          'FORCE_NEW': False,
+      }
+  }
+
+Other than ``BACKEND`` the keys are optional and default to the values shown. ``FORCE_NEW`` is used by elasticsearch-py. In addition, any other keys are passed directly to the Elasticsearch constructor as case-sensitive keyword arguments (e.g. ``'max_retries': 1``).
+
+If you prefer not to run an Elasticsearch server in development or production, there are many hosted services available, including `Searchly`_, who offer a free account suitable for testing and development. To use Searchly:
+
+-  Sign up for an account at `dashboard.searchly.com/users/sign\_up`_
+-  Use your Searchly dashboard to create a new index, e.g. 'wagtaildemo'
+-  Note the connection URL from your Searchly dashboard
+-  Configure ``URLS`` and ``INDEX`` in the Elasticsearch entry in ``WAGTAILSEARCH_BACKENDS``
+-  Run ``./manage.py update_index``
+
+.. _elasticsearch-py: http://elasticsearch-py.readthedocs.org
+.. _Searchly: http://www.searchly.com/
+.. _dashboard.searchly.com/users/sign\_up: https://dashboard.searchly.com/users/sign_up
+
+
+Rolling Your Own
+````````````````
+Wagtail search backends implement the interface defined in ``wagtail/wagtail/wagtailsearch/backends/base.py``. At a minimum, the backend's ``search()`` method must return a collection of objects or ``model.objects.none()``. For a fully-featured search backend, examine the Elasticsearch backend code in ``elasticsearch.py``.
\ No newline at end of file
diff --git a/docs/wagtailsearch/editors_picks.rst b/docs/wagtailsearch/editors_picks.rst
new file mode 100644
index 000000000..f899302b4
--- /dev/null
+++ b/docs/wagtailsearch/editors_picks.rst
@@ -0,0 +1,41 @@
+
+.. _wagtailsearch_editors_picks:
+
+
+Editors picks
+=============
+
+Editor's Picks are a way of explicitly linking relevant content to search terms, so results pages can contain curated content instead of being at the mercy of the search algorithm. In a template using the search results view, editor's picks can be accessed through the variable ``query.editors_picks``. To include editor's picks in your search results template, use the following properties.
+
+``query.editors_picks.all``
+  This gathers all of the editor's picks objects relating to the current query, in order according to their sort order in the Wagtail admin. You can then iterate through them using a ``{% for ... %}`` loop. Each editor's pick object provides these properties:
+
+  ``editors_pick.page``
+    The page object associated with the pick. Use ``{% pageurl editors_pick.page %}`` to generate a URL or provide other properties of the page object.
+
+  ``editors_pick.description``
+    The description entered when choosing the pick, perhaps explaining why the page is relevant to the search terms.
+
+Putting this all together, a block of your search results template displaying editor's Picks might look like this:
+
+.. code-block:: django
+
+  {% with query.editors_picks.all as editors_picks %}
+    {% if editors_picks %}
+      <div class="well">
+      <h3>Editors picks</h3>
+    <ul>
+      {% for editors_pick in editors_picks %}
+        <li>
+          <h4>
+        <a href="{% pageurl editors_pick.page %}">
+          {{ editors_pick.page.title }}
+        </a>
+          </h4>
+          <p>{{ editors_pick.description|safe }}</p>
+        </li>
+      {% endfor %}
+    </ul>
+      </div>
+    {% endif %}
+  {% endwith %}
\ No newline at end of file
diff --git a/docs/wagtail_search.rst b/docs/wagtailsearch/frontend_views.rst
similarity index 53%
rename from docs/wagtail_search.rst
rename to docs/wagtailsearch/frontend_views.rst
index 4c0a1ac74..e83bf52a5 100644
--- a/docs/wagtail_search.rst
+++ b/docs/wagtailsearch/frontend_views.rst
@@ -1,10 +1,10 @@
 
-.. _wagtail_search:
+.. _wagtailsearch_frontend_views:
 
-Search
-======
 
-Wagtail provides a comprehensive and extensible search interface. In addition, it provides ways to promote search results through "Editor's Picks." Wagtail also collects simple statistics on queries made through the search interface.
+Wagtailsearch frontend views
+============================
+
 
 Default Page Search
 -------------------
@@ -71,43 +71,6 @@ The search view provides a context with a few useful variables.
   ``query``
     A Wagtail ``Query`` object matching the terms. The ``Query`` model provides several class methods for viewing the statistics of all queries, but exposes only one property for single objects, ``query.hits``, which tracks the number of time the search string has been used over the lifetime of the site. ``Query`` also joins to the Editor's Picks functionality though ``query.editors_picks``. See :ref:`editors-picks`.
 
-Editor's Picks
---------------
-
-Editor's Picks are a way of explicitly linking relevant content to search terms, so results pages can contain curated content instead of being at the mercy of the search algorithm. In a template using the search results view, editor's picks can be accessed through the variable ``query.editors_picks``. To include editor's picks in your search results template, use the following properties.
-
-``query.editors_picks.all``
-  This gathers all of the editor's picks objects relating to the current query, in order according to their sort order in the Wagtail admin. You can then iterate through them using a ``{% for ... %}`` loop. Each editor's pick object provides these properties:
-
-  ``editors_pick.page``
-    The page object associated with the pick. Use ``{% pageurl editors_pick.page %}`` to generate a URL or provide other properties of the page object.
-
-  ``editors_pick.description``
-    The description entered when choosing the pick, perhaps explaining why the page is relevant to the search terms.
-
-Putting this all together, a block of your search results template displaying editor's Picks might look like this:
-
-.. code-block:: django
-
-  {% with query.editors_picks.all as editors_picks %}
-    {% if editors_picks %}
-      <div class="well">
-      <h3>Editors picks</h3>
-	<ul>
-	  {% for editors_pick in editors_picks %}
-	    <li>
-	      <h4>
-		<a href="{% pageurl editors_pick.page %}">
-		  {{ editors_pick.page.title }}
-		</a>
-	      </h4>
-	      <p>{{ editors_pick.description|safe }}</p>
-	    </li>
-	  {% endfor %}
-	</ul>
-      </div>
-    {% endif %}
-  {% endwith %}
 
 Asynchronous Search with JSON and AJAX
 --------------------------------------
@@ -142,30 +105,30 @@ Finally, we'll use JQuery to make the asynchronous requests and handle the inter
     // when there's something in the input box, make the query
     searchBox.on('input', function() {
       if( searchBox.val() == ''){
-	resultsBox.html('');
-	return;
+    resultsBox.html('');
+    return;
       }
       // make the request to the Wagtail JSON search view
       $.ajax({
-	url: wagtailJSONSearchURL + "?q=" +  searchBox.val(),
-	dataType: "json"
+    url: wagtailJSONSearchURL + "?q=" +  searchBox.val(),
+    dataType: "json"
       })
       .done(function(data) {
-	console.log(data);
-	if( data == undefined ){
-	  resultsBox.html('');
-	  return;
-	}
-	// we're in business!  let's format the results
-	var htmlOutput = '';
-	data.forEach(function(element, index, array){
-	  htmlOutput += '<p><a href="' + element.url + '">' + element.title + '</a></p>';
-	});
-	// and display them
-	resultsBox.html(htmlOutput);
+    console.log(data);
+    if( data == undefined ){
+      resultsBox.html('');
+      return;
+    }
+    // we're in business!  let's format the results
+    var htmlOutput = '';
+    data.forEach(function(element, index, array){
+      htmlOutput += '<p><a href="' + element.url + '">' + element.title + '</a></p>';
+    });
+    // and display them
+    resultsBox.html(htmlOutput);
       })
       .error(function(data){
-	console.log(data);
+    console.log(data);
       });
     });
 
@@ -178,12 +141,12 @@ Results are returned as a JSON object with this structure:
   {
     [
       {
-	title: "Lumpy Space Princess",
-	url: "/oh-my-glob/"
+    title: "Lumpy Space Princess",
+    url: "/oh-my-glob/"
       },
       {
-	title: "Lumpy Space",
-	url: "/no-smooth-posers/"
+    title: "Lumpy Space",
+    url: "/no-smooth-posers/"
       },
       ...
     ]
@@ -199,67 +162,8 @@ The AJAX interface uses the same view as the normal HTML search, ``wagtailsearch
 
 In this template, you'll have access to the same context variables provided to the HTML template. You could provide a template in JSON format with extra properties, such as ``query.hits`` and editor's picks, or render an HTML snippet that can go directly into your results ``<div>``. If you need more flexibility, such as multiple formats/templates based on differing requests, you can set up a custom search view.
 
-.. _editors-picks:
 
+Custom Search Views
+-------------------
 
-Indexing Custom Fields & Custom Search Views
---------------------------------------------
-
-This functionality is still under active development to provide a streamlined interface, but take a look at ``wagtail/wagtail/wagtailsearch/views/frontend.py`` if you are interested in coding custom search views.
-
-
-Search Backends
----------------
-
-Wagtail can degrade to a database-backed text search, but we strongly recommend `Elasticsearch`_.
-
-.. _Elasticsearch: http://www.elasticsearch.org/
-
-
-Default DB Backend
-``````````````````
-The default DB search backend uses Django's ``__icontains`` filter.
-
-
-Elasticsearch Backend
-`````````````````````
-Prerequisites are the Elasticsearch service itself and, via pip, the `elasticsearch-py`_ package:
-
-.. code-block:: guess
-
-  pip install elasticsearch
-
-.. note::
-  If you are using Elasticsearch < 1.0, install elasticsearch-py version 0.4.5: ```pip install elasticsearch==0.4.5```
-
-The backend is configured in settings:
-
-.. code-block:: python
-
-  WAGTAILSEARCH_BACKENDS = {
-      'default': {
-          'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch',
-          'URLS': ['http://localhost:9200'],
-          'INDEX': 'wagtail',
-          'TIMEOUT': 5,
-          'FORCE_NEW': False,
-      }
-  }
-
-Other than ``BACKEND`` the keys are optional and default to the values shown. ``FORCE_NEW`` is used by elasticsearch-py. In addition, any other keys are passed directly to the Elasticsearch constructor as case-sensitive keyword arguments (e.g. ``'max_retries': 1``).
-
-If you prefer not to run an Elasticsearch server in development or production, there are many hosted services available, including `Searchly`_, who offer a free account suitable for testing and development. To use Searchly:
-
--  Sign up for an account at `dashboard.searchly.com/users/sign\_up`_
--  Use your Searchly dashboard to create a new index, e.g. 'wagtaildemo'
--  Note the connection URL from your Searchly dashboard
--  Configure ``URLS`` and ``INDEX`` in the Elasticsearch entry in ``WAGTAILSEARCH_BACKENDS``
--  Run ``./manage.py update_index``
-
-.. _elasticsearch-py: http://elasticsearch-py.readthedocs.org
-.. _Searchly: http://www.searchly.com/
-.. _dashboard.searchly.com/users/sign\_up: https://dashboard.searchly.com/users/sign_up
-
-Rolling Your Own
-````````````````
-Wagtail search backends implement the interface defined in ``wagtail/wagtail/wagtailsearch/backends/base.py``. At a minimum, the backend's ``search()`` method must return a collection of objects or ``model.objects.none()``. For a fully-featured search backend, examine the Elasticsearch backend code in ``elasticsearch.py``.
+This functionality is still under active development to provide a streamlined interface, but take a look at ``wagtail/wagtail/wagtailsearch/views/frontend.py`` if you are interested in coding custom search views.
\ No newline at end of file
diff --git a/docs/wagtailsearch/index.rst b/docs/wagtailsearch/index.rst
new file mode 100644
index 000000000..f73ea787b
--- /dev/null
+++ b/docs/wagtailsearch/index.rst
@@ -0,0 +1,15 @@
+
+.. _wagtailsearch:
+
+
+Wagtailsearch
+=============
+
+Wagtail provides a comprehensive and extensible search interface. In addition, it provides ways to promote search results through "Editor's Picks." Wagtail also collects simple statistics on queries made through the search interface.
+
+.. toctree::
+    :maxdepth: 2
+
+    configuration
+    frontend_views
+    editors_picks

From d4c4c08d7c5d772de9b87c7b94f18c06ca8913f2 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 9 Jul 2014 15:18:22 +0100
Subject: [PATCH 119/154] add tests for lt, gte, lte lookups in
 TestElasticSearchQuery

---
 .../tests/test_elasticsearch_backend.py       | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
index 0c7906b39..f97166fc4 100644
--- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
+++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
@@ -191,7 +191,6 @@ class TestElasticSearchQuery(TestCase):
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_gt_lookup(self):
-        # This shares the same code path as gte, lt and lte so theres no need to test those
         # This also tests conversion of python dates to strings
 
         # Create a query
@@ -201,6 +200,30 @@ class TestElasticSearchQuery(TestCase):
         expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gt': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
+    def test_lt_lookup(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__lt=datetime.datetime(2014, 4, 29)), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'lt': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_gte_lookup(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__gte=datetime.datetime(2014, 4, 29)), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gte': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
+    def test_lte_lookup(self):
+        # Create a query
+        query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__lte=datetime.datetime(2014, 4, 29)), "Hello")
+
+        # Check it
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'lte': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        self.assertDictEqual(query.to_es(), expected_result)
+
     def test_range_lookup(self):
         start_date = datetime.datetime(2014, 4, 29)
         end_date = datetime.datetime(2014, 8, 19)

From 70261780f62c85babfafff2e1d0f3b32fe6f6c2b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 15:28:47 +0100
Subject: [PATCH 120/154] Added search fields configuration docs

---
 docs/wagtailsearch/configuration.rst | 142 ++++++++++++++++++++++++---
 1 file changed, 128 insertions(+), 14 deletions(-)

diff --git a/docs/wagtailsearch/configuration.rst b/docs/wagtailsearch/configuration.rst
index 765e81b84..6e8739d1c 100644
--- a/docs/wagtailsearch/configuration.rst
+++ b/docs/wagtailsearch/configuration.rst
@@ -1,39 +1,152 @@
 
 .. _wagtailsearch_configuration:
 
-
+===========================
 Wagtailsearch configuration
-============================
+===========================
 
 
-Adding extra search fields
---------------------------
+Indexing extra fields
+=====================
 
- - SearchField
- - FilterField
- - Callable search fields
- - Indexing fields in child/related objects
+Fields need to be explicitly added to the search configuration in order for you to be able to search/filter on them.
+
+You can add new fields to the search index by overriding the ``search_fields`` property and appending a list of extra ``SearchField``/``FilterField`` objects to it.
+
+``Page`` sets a default value to ``search_fields`` indexing the ``title`` field as a ``SearchField`` and some other generally useful fields as ``FilterField``s.
+
+
+Quick example
+-------------
+
+This creates an ``EventPage`` model with two fields ``description`` and ``date``. ``description`` is indexed as a ``SearchField`` and ``date`` is indexed as a ``FilterField``
+
+
+.. code-block:: python
+
+    from wagtail.wagtailsearch import indexed
+
+    class EventPage(Page):
+        description = models.TextField()
+        date = models.DateField()
+
+        search_fields = Page.search_fields + ( # Inherit search_fields from Page
+            indexed.SearchField('description'),
+            indexed.FilterField('date'),
+        )
+
+
+    # Get future events which contain the string "Christmas" in the title or description
+    >>> EventPage.objects.filter(date__gt=timezone.now()).search("Christmas")
+
+
+``indexed.SearchField``
+-----------------------
+
+These are added to the search index and are used for performing full-text searches on your models. These would usually be text fields.
+
+
+Options
+```````
+
+ - **partial_match** (boolean) - Setting this to true allows results to be matched on parts of words. For example, this is set on the title field by default so a page titled "Hello World!" will be found if the user only types "Hel" into the search box.
+ - **boost** (number) - This allows you to set fields as being more important than others. Setting this to a high number on a field will make pages with matches in that field to be ranked higher. By default, this is set to 100 on the title field and 1 on all other fields.
+ - **es_extra** (dict) - This field is to allow the developer to set or override any setting on the field in the ElasticSearch mapping. Use this if you want to make use of any ElasticSearch features that are not yet supported in Wagtail.
+
+
+``indexed.FilterField``
+-----------------------
+
+These are added to the search index but are not used for full-text searches. Instead, they allow you to run filters on your search results.
+
+
+Indexing callables and other attributes
+---------------------------------------
+
+ .. note::
+
+     This is not supported in the `Database Backend`_
+
+
+Search/filter fields do not need to be Django fields, they could be any method or attribute on your class.
+
+One use for this is indexing ``get_*_display`` methods Django creates automatically for fields with choices.
+
+
+.. code-block:: python
+
+    from wagtail.wagtailsearch import indexed
+
+    class EventPage(Page):
+        IS_PRIVATE_CHOICES = (
+            (False, "Public"),
+            (True, "Private"),
+        )
+
+        is_private = models.BooleanField(choices=IS_PRIVATE_CHOICES)
+
+        search_fields = Page.search_fields + (
+            # Index the human-readable string for searching
+            indexed.SearchField('get_is_private_display'),
+
+            # Index the boolean value for filtering
+            indexed.FilterField('is_private'),
+        )
 
 
 Indexing non-page models
-------------------------
+========================
+
+Any Django model can be indexed and searched.
+
+To do this, inherit from ``indexed.Indexed`` and add some ``search_fields`` to the model.
+
+.. code-block:: python
+
+    from wagtail.wagtailsearch import indexed
+
+    class Book(models.Model, indexed.Indexed):
+        title = models.CharField(max_length=255)
+        genre = models.CharField(max_length=255, choices=GENRE_CHOICES)
+        author = models.ForeignKey(Author)
+        published_date = models.DateTimeField()
+
+        search_fields = [
+            SearchField('title', partial_match=True, boost=10),
+            SearchField('get_genre_display'),
+
+            FilterField('genre'),
+            FilterField('author'),
+            FilterField('published_date'),
+        ]
+
+    # As this model doesn't have a search method in its QuerySet, we have to call search directly on the backend
+    >>> from wagtail.wagtailsearch.backends import get_search_backend
+    >>> s = get_search_backend()
+
+    # Run a search for a book by Roald Dahl
+    >>> roald_dahl = Author.objects.get(name="Roald Dahl")
+    >>> s.search("chocolate factory", Book.objects.filter(author=roald_dahl))
+    [<Book: Charlie and the chocolate factory>]
 
 
 Search Backends
----------------
+===============
 
 Wagtail can degrade to a database-backed text search, but we strongly recommend `Elasticsearch`_.
 
 .. _Elasticsearch: http://www.elasticsearch.org/
 
 
-Default DB Backend
-``````````````````
+Database Backend
+----------------
+
 The default DB search backend uses Django's ``__icontains`` filter.
 
 
 Elasticsearch Backend
-`````````````````````
+---------------------
+
 Prerequisites are the Elasticsearch service itself and, via pip, the `elasticsearch-py`_ package:
 
 .. code-block:: guess
@@ -73,5 +186,6 @@ If you prefer not to run an Elasticsearch server in development or production, t
 
 
 Rolling Your Own
-````````````````
+----------------
+
 Wagtail search backends implement the interface defined in ``wagtail/wagtail/wagtailsearch/backends/base.py``. At a minimum, the backend's ``search()`` method must return a collection of objects or ``model.objects.none()``. For a fully-featured search backend, examine the Elasticsearch backend code in ``elasticsearch.py``.
\ No newline at end of file

From cb556c9ede449aca4ef898e782144108eb769db3 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 15:42:44 +0100
Subject: [PATCH 121/154] Splitup search configuration docs

---
 docs/wagtailsearch/backends.rst               | 64 +++++++++++++++++
 ...guration.rst => for_python_developers.rst} | 70 ++-----------------
 docs/wagtailsearch/index.rst                  |  4 +-
 3 files changed, 72 insertions(+), 66 deletions(-)
 create mode 100644 docs/wagtailsearch/backends.rst
 rename docs/wagtailsearch/{configuration.rst => for_python_developers.rst} (64%)

diff --git a/docs/wagtailsearch/backends.rst b/docs/wagtailsearch/backends.rst
new file mode 100644
index 000000000..f6bb2f296
--- /dev/null
+++ b/docs/wagtailsearch/backends.rst
@@ -0,0 +1,64 @@
+
+.. _wagtailsearch_backends:
+
+======================
+Wagtailsearch backends
+======================
+
+
+Wagtail can degrade to a database-backed text search, but we strongly recommend `Elasticsearch`_.
+
+.. _Elasticsearch: http://www.elasticsearch.org/
+
+
+Database Backend
+===============
+
+The default DB search backend uses Django's ``__icontains`` filter.
+
+
+Elasticsearch Backend
+=====================
+
+Prerequisites are the Elasticsearch service itself and, via pip, the `elasticsearch-py`_ package:
+
+.. code-block:: guess
+
+  pip install elasticsearch
+
+.. note::
+  If you are using Elasticsearch < 1.0, install elasticsearch-py version 0.4.5: ```pip install elasticsearch==0.4.5```
+
+The backend is configured in settings:
+
+.. code-block:: python
+
+  WAGTAILSEARCH_BACKENDS = {
+      'default': {
+          'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch',
+          'URLS': ['http://localhost:9200'],
+          'INDEX': 'wagtail',
+          'TIMEOUT': 5,
+          'FORCE_NEW': False,
+      }
+  }
+
+Other than ``BACKEND`` the keys are optional and default to the values shown. ``FORCE_NEW`` is used by elasticsearch-py. In addition, any other keys are passed directly to the Elasticsearch constructor as case-sensitive keyword arguments (e.g. ``'max_retries': 1``).
+
+If you prefer not to run an Elasticsearch server in development or production, there are many hosted services available, including `Searchly`_, who offer a free account suitable for testing and development. To use Searchly:
+
+-  Sign up for an account at `dashboard.searchly.com/users/sign\_up`_
+-  Use your Searchly dashboard to create a new index, e.g. 'wagtaildemo'
+-  Note the connection URL from your Searchly dashboard
+-  Configure ``URLS`` and ``INDEX`` in the Elasticsearch entry in ``WAGTAILSEARCH_BACKENDS``
+-  Run ``./manage.py update_index``
+
+.. _elasticsearch-py: http://elasticsearch-py.readthedocs.org
+.. _Searchly: http://www.searchly.com/
+.. _dashboard.searchly.com/users/sign\_up: https://dashboard.searchly.com/users/sign_up
+
+
+Rolling Your Own
+================
+
+Wagtail search backends implement the interface defined in ``wagtail/wagtail/wagtailsearch/backends/base.py``. At a minimum, the backend's ``search()`` method must return a collection of objects or ``model.objects.none()``. For a fully-featured search backend, examine the Elasticsearch backend code in ``elasticsearch.py``.
\ No newline at end of file
diff --git a/docs/wagtailsearch/configuration.rst b/docs/wagtailsearch/for_python_developers.rst
similarity index 64%
rename from docs/wagtailsearch/configuration.rst
rename to docs/wagtailsearch/for_python_developers.rst
index 6e8739d1c..d183bfe31 100644
--- a/docs/wagtailsearch/configuration.rst
+++ b/docs/wagtailsearch/for_python_developers.rst
@@ -1,9 +1,10 @@
 
-.. _wagtailsearch_configuration:
+.. _wagtailsearch_for_python_developers:
 
-===========================
-Wagtailsearch configuration
-===========================
+
+====================================
+Wagtailsearch: For python developers
+====================================
 
 
 Indexing extra fields
@@ -128,64 +129,3 @@ To do this, inherit from ``indexed.Indexed`` and add some ``search_fields`` to t
     >>> roald_dahl = Author.objects.get(name="Roald Dahl")
     >>> s.search("chocolate factory", Book.objects.filter(author=roald_dahl))
     [<Book: Charlie and the chocolate factory>]
-
-
-Search Backends
-===============
-
-Wagtail can degrade to a database-backed text search, but we strongly recommend `Elasticsearch`_.
-
-.. _Elasticsearch: http://www.elasticsearch.org/
-
-
-Database Backend
-----------------
-
-The default DB search backend uses Django's ``__icontains`` filter.
-
-
-Elasticsearch Backend
----------------------
-
-Prerequisites are the Elasticsearch service itself and, via pip, the `elasticsearch-py`_ package:
-
-.. code-block:: guess
-
-  pip install elasticsearch
-
-.. note::
-  If you are using Elasticsearch < 1.0, install elasticsearch-py version 0.4.5: ```pip install elasticsearch==0.4.5```
-
-The backend is configured in settings:
-
-.. code-block:: python
-
-  WAGTAILSEARCH_BACKENDS = {
-      'default': {
-          'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch',
-          'URLS': ['http://localhost:9200'],
-          'INDEX': 'wagtail',
-          'TIMEOUT': 5,
-          'FORCE_NEW': False,
-      }
-  }
-
-Other than ``BACKEND`` the keys are optional and default to the values shown. ``FORCE_NEW`` is used by elasticsearch-py. In addition, any other keys are passed directly to the Elasticsearch constructor as case-sensitive keyword arguments (e.g. ``'max_retries': 1``).
-
-If you prefer not to run an Elasticsearch server in development or production, there are many hosted services available, including `Searchly`_, who offer a free account suitable for testing and development. To use Searchly:
-
--  Sign up for an account at `dashboard.searchly.com/users/sign\_up`_
--  Use your Searchly dashboard to create a new index, e.g. 'wagtaildemo'
--  Note the connection URL from your Searchly dashboard
--  Configure ``URLS`` and ``INDEX`` in the Elasticsearch entry in ``WAGTAILSEARCH_BACKENDS``
--  Run ``./manage.py update_index``
-
-.. _elasticsearch-py: http://elasticsearch-py.readthedocs.org
-.. _Searchly: http://www.searchly.com/
-.. _dashboard.searchly.com/users/sign\_up: https://dashboard.searchly.com/users/sign_up
-
-
-Rolling Your Own
-----------------
-
-Wagtail search backends implement the interface defined in ``wagtail/wagtail/wagtailsearch/backends/base.py``. At a minimum, the backend's ``search()`` method must return a collection of objects or ``model.objects.none()``. For a fully-featured search backend, examine the Elasticsearch backend code in ``elasticsearch.py``.
\ No newline at end of file
diff --git a/docs/wagtailsearch/index.rst b/docs/wagtailsearch/index.rst
index f73ea787b..c11d7f675 100644
--- a/docs/wagtailsearch/index.rst
+++ b/docs/wagtailsearch/index.rst
@@ -7,9 +7,11 @@ Wagtailsearch
 
 Wagtail provides a comprehensive and extensible search interface. In addition, it provides ways to promote search results through "Editor's Picks." Wagtail also collects simple statistics on queries made through the search interface.
 
+
 .. toctree::
     :maxdepth: 2
 
-    configuration
+    for_python_developers
     frontend_views
     editors_picks
+    backends

From 474868439090f647aa869ecf0b4753cfa8e60d5b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 15:43:07 +0100
Subject: [PATCH 122/154] Added basic useage docs for python developers

---
 docs/wagtailsearch/for_python_developers.rst | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/wagtailsearch/for_python_developers.rst b/docs/wagtailsearch/for_python_developers.rst
index d183bfe31..548510f6f 100644
--- a/docs/wagtailsearch/for_python_developers.rst
+++ b/docs/wagtailsearch/for_python_developers.rst
@@ -7,6 +7,27 @@ Wagtailsearch: For python developers
 ====================================
 
 
+Basic useage
+============
+
+All searches are performed on Django QuerySets:
+
+.. code-block:: python
+
+    # Search future EventPages
+    >>> from wagtail.wagtailcore.models import EventPage
+    EventPage.objects.filter(date__gt=timezone.now()).search("Hello world!")
+
+
+All methods of ``PageQuerySet`` are supported by wagtailsearch:
+
+.. code-block:: python
+
+    # Search all live EventPages that are under the events index
+    >>> EventPage.objects.live().descendant_of(events_index).search("Hello")
+    [<EventPage: Event 1>, <EventPage: Event 2>]
+
+
 Indexing extra fields
 =====================
 

From fa97565b2a9d424c894dddf01e4624adf1092951 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 15:45:41 +0100
Subject: [PATCH 123/154] Fix spelling mistake

---
 docs/wagtailsearch/for_python_developers.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/wagtailsearch/for_python_developers.rst b/docs/wagtailsearch/for_python_developers.rst
index 548510f6f..a49603d43 100644
--- a/docs/wagtailsearch/for_python_developers.rst
+++ b/docs/wagtailsearch/for_python_developers.rst
@@ -7,8 +7,8 @@ Wagtailsearch: For python developers
 ====================================
 
 
-Basic useage
-============
+Basic usage
+===========
 
 All searches are performed on Django QuerySets:
 

From 33e947703292792d7f6e453a3452788cd936e040 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 15:46:36 +0100
Subject: [PATCH 124/154] Doc tweak

---
 docs/wagtailsearch/for_python_developers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/wagtailsearch/for_python_developers.rst b/docs/wagtailsearch/for_python_developers.rst
index a49603d43..c337e1275 100644
--- a/docs/wagtailsearch/for_python_developers.rst
+++ b/docs/wagtailsearch/for_python_developers.rst
@@ -10,7 +10,7 @@ Wagtailsearch: For python developers
 Basic usage
 ===========
 
-All searches are performed on Django QuerySets:
+All searches are performed on Django QuerySets. Wagtail provides a ``search`` method on the queryset for all page models:
 
 .. code-block:: python
 

From dbab06a88cc7b12ff728d9c1721d126ed0690202 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 15:47:00 +0100
Subject: [PATCH 125/154] Fixed typo

---
 docs/wagtailsearch/for_python_developers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/wagtailsearch/for_python_developers.rst b/docs/wagtailsearch/for_python_developers.rst
index c337e1275..44332a819 100644
--- a/docs/wagtailsearch/for_python_developers.rst
+++ b/docs/wagtailsearch/for_python_developers.rst
@@ -16,7 +16,7 @@ All searches are performed on Django QuerySets. Wagtail provides a ``search`` me
 
     # Search future EventPages
     >>> from wagtail.wagtailcore.models import EventPage
-    EventPage.objects.filter(date__gt=timezone.now()).search("Hello world!")
+    >>> EventPage.objects.filter(date__gt=timezone.now()).search("Hello world!")
 
 
 All methods of ``PageQuerySet`` are supported by wagtailsearch:

From 072f5c04e02a5412a0238286b0d3644d3a2a9267 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 16:07:53 +0100
Subject: [PATCH 126/154] Docs fixes

---
 docs/wagtailsearch/backends.rst              |  2 ++
 docs/wagtailsearch/for_python_developers.rst | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/wagtailsearch/backends.rst b/docs/wagtailsearch/backends.rst
index f6bb2f296..bd4974b11 100644
--- a/docs/wagtailsearch/backends.rst
+++ b/docs/wagtailsearch/backends.rst
@@ -11,6 +11,8 @@ Wagtail can degrade to a database-backed text search, but we strongly recommend
 .. _Elasticsearch: http://www.elasticsearch.org/
 
 
+.. _wagtailsearch_backends_database:
+
 Database Backend
 ===============
 
diff --git a/docs/wagtailsearch/for_python_developers.rst b/docs/wagtailsearch/for_python_developers.rst
index 44332a819..01098fdde 100644
--- a/docs/wagtailsearch/for_python_developers.rst
+++ b/docs/wagtailsearch/for_python_developers.rst
@@ -87,7 +87,7 @@ Indexing callables and other attributes
 
  .. note::
 
-     This is not supported in the `Database Backend`_
+     This is not supported in the :ref:`wagtailsearch_backends_database`
 
 
 Search/filter fields do not need to be Django fields, they could be any method or attribute on your class.
@@ -134,12 +134,12 @@ To do this, inherit from ``indexed.Indexed`` and add some ``search_fields`` to t
         published_date = models.DateTimeField()
 
         search_fields = [
-            SearchField('title', partial_match=True, boost=10),
-            SearchField('get_genre_display'),
+            indexed.SearchField('title', partial_match=True, boost=10),
+            indexed.SearchField('get_genre_display'),
 
-            FilterField('genre'),
-            FilterField('author'),
-            FilterField('published_date'),
+            indexed.FilterField('genre'),
+            indexed.FilterField('author'),
+            indexed.FilterField('published_date'),
         ]
 
     # As this model doesn't have a search method in its QuerySet, we have to call search directly on the backend

From 3a8bc7f3ed993422ce5cf00e673a4f699bd97616 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 16:09:07 +0100
Subject: [PATCH 127/154] Use tuples in search_fields configuration

Not a requirement, just a best practise
---
 docs/wagtailsearch/for_python_developers.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/wagtailsearch/for_python_developers.rst b/docs/wagtailsearch/for_python_developers.rst
index 01098fdde..506649976 100644
--- a/docs/wagtailsearch/for_python_developers.rst
+++ b/docs/wagtailsearch/for_python_developers.rst
@@ -133,14 +133,14 @@ To do this, inherit from ``indexed.Indexed`` and add some ``search_fields`` to t
         author = models.ForeignKey(Author)
         published_date = models.DateTimeField()
 
-        search_fields = [
+        search_fields = (
             indexed.SearchField('title', partial_match=True, boost=10),
             indexed.SearchField('get_genre_display'),
 
             indexed.FilterField('genre'),
             indexed.FilterField('author'),
             indexed.FilterField('published_date'),
-        ]
+        )
 
     # As this model doesn't have a search method in its QuerySet, we have to call search directly on the backend
     >>> from wagtail.wagtailsearch.backends import get_search_backend

From 677d0333f4906fbfd590a2c32262cad14b995180 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 9 Jul 2014 16:26:54 +0100
Subject: [PATCH 128/154] suppress DeprecationWarnings thrown in tests by
 classes with old-style indexed_fields definitions

---
 wagtail/tests/utils.py                            | 14 ++++++++++++++
 wagtail/wagtailsearch/tests/test_backends.py      |  8 +++++---
 wagtail/wagtailsearch/tests/test_indexed_class.py | 14 +++++++++-----
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py
index 9360f2206..2e95d0210 100644
--- a/wagtail/tests/utils.py
+++ b/wagtail/tests/utils.py
@@ -1,3 +1,6 @@
+from contextlib import contextmanager
+import warnings
+
 from django.contrib.auth.models import User
 from django.utils import six
 
@@ -25,3 +28,14 @@ class WagtailTestUtils(object):
 
     def assertRegex(self, *args, **kwargs):
         six.assertRegex(self, *args, **kwargs)
+
+    @staticmethod
+    @contextmanager
+    def ignore_deprecation_warnings():
+        with warnings.catch_warnings(record=True) as warning_list:  # catch all warnings
+            yield
+
+        # rethrow all warnings that were not DeprecationWarnings
+        for w in warning_list:
+            if not issubclass(w.category, DeprecationWarning):
+                warnings.showwarning(message=w.message, category=w.category, filename=w.filename, lineno=w.lineno, file=w.file, line=w.line)
diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py
index e9b656298..9baf64957 100644
--- a/wagtail/wagtailsearch/tests/test_backends.py
+++ b/wagtail/wagtailsearch/tests/test_backends.py
@@ -1,17 +1,18 @@
 from six import StringIO
+import warnings
 
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.conf import settings
 from django.core import management
 
-from wagtail.tests.utils import unittest
+from wagtail.tests.utils import unittest, WagtailTestUtils
 from wagtail.tests import models
 from wagtail.wagtailsearch.backends import get_search_backend, InvalidSearchBackendError
 from wagtail.wagtailsearch.backends.db import DBSearch
 
 
-class BackendTests(object):
+class BackendTests(WagtailTestUtils):
     # To test a specific backend, subclass BackendTests and define self.backend_path.
 
     def setUp(self):
@@ -144,7 +145,8 @@ class BackendTests(object):
         self.backend.reset_index()
 
         # Run update_index command
-        management.call_command('update_index', backend=self.backend, interactive=False, stdout=StringIO())
+        with self.ignore_deprecation_warnings():  # ignore any DeprecationWarnings thrown by models with old-style indexed_fields definitions
+            management.call_command('update_index', backend=self.backend, interactive=False, stdout=StringIO())
 
         # Check that there are still 3 results
         results = self.backend.search("Hello", models.SearchTest)
diff --git a/wagtail/wagtailsearch/tests/test_indexed_class.py b/wagtail/wagtailsearch/tests/test_indexed_class.py
index a54f135c3..983d8e0ba 100644
--- a/wagtail/wagtailsearch/tests/test_indexed_class.py
+++ b/wagtail/wagtailsearch/tests/test_indexed_class.py
@@ -1,8 +1,10 @@
+import warnings
+
 from django.test import TestCase
-from wagtail.tests import models
-import json
 
 from wagtail.wagtailsearch import indexed
+from wagtail.tests import models
+from wagtail.tests.utils import WagtailTestUtils
 
 
 class TestContentTypeNames(TestCase):
@@ -15,10 +17,11 @@ class TestContentTypeNames(TestCase):
         self.assertEqual(name, 'tests_searchtest_tests_searchtestchild')
 
 
-class TestIndexedFieldsBackwardsCompatibility(TestCase):
+class TestIndexedFieldsBackwardsCompatibility(TestCase, WagtailTestUtils):
     def test_indexed_fields_backwards_compatibility(self):
         # Get search fields
-        search_fields = models.SearchTestOldConfig.get_search_fields()
+        with self.ignore_deprecation_warnings():
+            search_fields = models.SearchTestOldConfig.get_search_fields()
 
         search_fields_dict = dict(
             ((field.field_name, type(field)), field)
@@ -36,7 +39,8 @@ class TestIndexedFieldsBackwardsCompatibility(TestCase):
 
     def test_indexed_fields_backwards_compatibility_list(self):
         # Get search fields
-        search_fields = models.SearchTestOldConfigList.get_search_fields()
+        with self.ignore_deprecation_warnings():
+            search_fields = models.SearchTestOldConfigList.get_search_fields()
 
         search_fields_dict = dict(
             ((field.field_name, type(field)), field)

From 5766224808e6972f1fe85148ce2fe64608367690 Mon Sep 17 00:00:00 2001
From: Robert Clark <robert@bablmedia.com>
Date: Wed, 9 Jul 2014 12:09:19 -0400
Subject: [PATCH 129/154] sitemap should return the full url

---
 wagtail/wagtailcore/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py
index c6a4f6854..18dc018ad 100644
--- a/wagtail/wagtailcore/models.py
+++ b/wagtail/wagtailcore/models.py
@@ -774,7 +774,7 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, indexed.Index
 
         return [
             {
-                'location': self.url,
+                'location': self.full_url,
                 'lastmod': latest_revision.created_at if latest_revision else None
             }
         ]

From bc2556db280e09f98b9088a92bec7e0138f56571 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 17:16:20 +0100
Subject: [PATCH 130/154] Updated tests for 5766224

---
 wagtail/contrib/wagtailsitemaps/tests.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wagtail/contrib/wagtailsitemaps/tests.py b/wagtail/contrib/wagtailsitemaps/tests.py
index 469e210ad..a556ce156 100644
--- a/wagtail/contrib/wagtailsitemaps/tests.py
+++ b/wagtail/contrib/wagtailsitemaps/tests.py
@@ -44,21 +44,21 @@ class TestSitemapGenerator(TestCase):
         sitemap = Sitemap(self.site)
         urls = [url['location'] for url in sitemap.get_urls()]
 
-        self.assertIn('/', urls) # Homepage
-        self.assertIn('/hello-world/', urls) # Child page
+        self.assertIn('http://localhost/', urls) # Homepage
+        self.assertIn('http://localhost/hello-world/', urls) # Child page
 
     def test_render(self):
         sitemap = Sitemap(self.site)
         xml = sitemap.render()
 
         # Check that a URL has made it into the xml
-        self.assertIn('/hello-world/', xml)
+        self.assertIn('http://localhost/hello-world/', xml)
 
         # Make sure the unpublished page didn't make it into the xml
-        self.assertNotIn('/unpublished/', xml)
+        self.assertNotIn('http://localhost/unpublished/', xml)
 
         # Make sure the protected page didn't make it into the xml
-        self.assertNotIn('/protected/', xml)
+        self.assertNotIn('http://localhost/protected/', xml)
 
 
 class TestSitemapView(TestCase):

From 5eaa60531460249799875ec913b6eb978212e11d Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 17:33:58 +0100
Subject: [PATCH 131/154] Fixed search example in docs

---
 docs/wagtailsearch/for_python_developers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/wagtailsearch/for_python_developers.rst b/docs/wagtailsearch/for_python_developers.rst
index 506649976..be389e500 100644
--- a/docs/wagtailsearch/for_python_developers.rst
+++ b/docs/wagtailsearch/for_python_developers.rst
@@ -24,7 +24,7 @@ All methods of ``PageQuerySet`` are supported by wagtailsearch:
 .. code-block:: python
 
     # Search all live EventPages that are under the events index
-    >>> EventPage.objects.live().descendant_of(events_index).search("Hello")
+    >>> EventPage.objects.live().descendant_of(events_index).search("Event")
     [<EventPage: Event 1>, <EventPage: Event 2>]
 
 

From 8e0752827450d31e2bc9cecff3b343d6083451e3 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 17:44:26 +0100
Subject: [PATCH 132/154] Renamed 'wagtailsearch' section of the docs to
 'search'

---
 docs/index.rst                                           | 2 +-
 docs/{wagtailsearch => search}/backends.rst              | 0
 docs/{wagtailsearch => search}/editors_picks.rst         | 0
 docs/{wagtailsearch => search}/for_python_developers.rst | 0
 docs/{wagtailsearch => search}/frontend_views.rst        | 0
 docs/{wagtailsearch => search}/index.rst                 | 4 ++--
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename docs/{wagtailsearch => search}/backends.rst (100%)
 rename docs/{wagtailsearch => search}/editors_picks.rst (100%)
 rename docs/{wagtailsearch => search}/for_python_developers.rst (100%)
 rename docs/{wagtailsearch => search}/frontend_views.rst (100%)
 rename docs/{wagtailsearch => search}/index.rst (92%)

diff --git a/docs/index.rst b/docs/index.rst
index b2d9a534d..a040fe767 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,7 +13,7 @@ It supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 suppo
    building_your_site/index
    editing_api
    snippets
-   wagtailsearch/index
+   search/index
    form_builder
    model_recipes
    advanced_topics
diff --git a/docs/wagtailsearch/backends.rst b/docs/search/backends.rst
similarity index 100%
rename from docs/wagtailsearch/backends.rst
rename to docs/search/backends.rst
diff --git a/docs/wagtailsearch/editors_picks.rst b/docs/search/editors_picks.rst
similarity index 100%
rename from docs/wagtailsearch/editors_picks.rst
rename to docs/search/editors_picks.rst
diff --git a/docs/wagtailsearch/for_python_developers.rst b/docs/search/for_python_developers.rst
similarity index 100%
rename from docs/wagtailsearch/for_python_developers.rst
rename to docs/search/for_python_developers.rst
diff --git a/docs/wagtailsearch/frontend_views.rst b/docs/search/frontend_views.rst
similarity index 100%
rename from docs/wagtailsearch/frontend_views.rst
rename to docs/search/frontend_views.rst
diff --git a/docs/wagtailsearch/index.rst b/docs/search/index.rst
similarity index 92%
rename from docs/wagtailsearch/index.rst
rename to docs/search/index.rst
index c11d7f675..e343f76c8 100644
--- a/docs/wagtailsearch/index.rst
+++ b/docs/search/index.rst
@@ -2,8 +2,8 @@
 .. _wagtailsearch:
 
 
-Wagtailsearch
-=============
+Search
+======
 
 Wagtail provides a comprehensive and extensible search interface. In addition, it provides ways to promote search results through "Editor's Picks." Wagtail also collects simple statistics on queries made through the search interface.
 

From 1cc3456f580b397d0b2353641064e53d713ceb55 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 17:46:34 +0100
Subject: [PATCH 133/154] Removed 'wagtailsearch' from titles of a couple of
 documents

---
 docs/search/for_python_developers.rst | 6 +++---
 docs/search/frontend_views.rst        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/search/for_python_developers.rst b/docs/search/for_python_developers.rst
index be389e500..c73799a7a 100644
--- a/docs/search/for_python_developers.rst
+++ b/docs/search/for_python_developers.rst
@@ -2,9 +2,9 @@
 .. _wagtailsearch_for_python_developers:
 
 
-====================================
-Wagtailsearch: For python developers
-====================================
+=====================
+For python developers
+=====================
 
 
 Basic usage
diff --git a/docs/search/frontend_views.rst b/docs/search/frontend_views.rst
index e83bf52a5..1e1ad3fd3 100644
--- a/docs/search/frontend_views.rst
+++ b/docs/search/frontend_views.rst
@@ -2,8 +2,8 @@
 .. _wagtailsearch_frontend_views:
 
 
-Wagtailsearch frontend views
-============================
+Frontend views
+==============
 
 
 Default Page Search

From b067fad1f9b8f60d994327a48cf4cedac1575e1a Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Wed, 9 Jul 2014 17:47:33 +0100
Subject: [PATCH 134/154] Renamed 'Wagtailsearch backends' to 'Backends'

---
 docs/search/backends.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/search/backends.rst b/docs/search/backends.rst
index bd4974b11..eba6d8a1a 100644
--- a/docs/search/backends.rst
+++ b/docs/search/backends.rst
@@ -1,9 +1,9 @@
 
 .. _wagtailsearch_backends:
 
-======================
-Wagtailsearch backends
-======================
+========
+Backends
+========
 
 
 Wagtail can degrade to a database-backed text search, but we strongly recommend `Elasticsearch`_.

From 9b8ee979d211be83bd73691df893e9c915b65df0 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 9 Jul 2014 23:29:37 +0100
Subject: [PATCH 135/154] fix tests for lt, gte, lte filters to expect a
 multi_match response

---
 wagtail/wagtailsearch/tests/test_elasticsearch_backend.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
index 18b3f7ce0..a95d442ff 100644
--- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
+++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
@@ -205,7 +205,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__lt=datetime.datetime(2014, 4, 29)), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'lt': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'lt': '2014-04-29'}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_gte_lookup(self):
@@ -213,7 +213,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__gte=datetime.datetime(2014, 4, 29)), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gte': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gte': '2014-04-29'}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_lte_lookup(self):
@@ -221,7 +221,7 @@ class TestElasticSearchQuery(TestCase):
         query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__lte=datetime.datetime(2014, 4, 29)), "Hello")
 
         # Check it
-        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'lte': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
+        expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'lte': '2014-04-29'}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}}
         self.assertDictEqual(query.to_es(), expected_result)
 
     def test_range_lookup(self):

From bd1c72c0aab71743633c31b444a50d997b9fe0d7 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <davecranwell@users.noreply.github.com>
Date: Thu, 10 Jul 2014 11:47:40 +0100
Subject: [PATCH 136/154] References to image.src corrected - it's image.url

---
 docs/building_your_site/frontenddevelopers.rst | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index a3ba8eaa2..8c3ffa479 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -202,26 +202,31 @@ Extra attributes can be specified with the syntax ``attribute="value"``:
 
     {% image self.photo width-400 class="foo" id="bar" %}
 
-No validation is performed on attributes add in this way by the developer. It's possible to add `src`, `width`, `height` and `alt` of your own that might conflict with those generated by the tag itself.
+No validation is performed on attributes added in this way so it's possible to add `src`, `width`, `height` and `alt` of your own that might conflict with those generated by the tag itself.
 
 
-**Generating the image "as"**
+**Generating the image "as foo" to access individual properties **
 
-Wagtail can assign the image data to another object using Django's ``as`` syntax:
+Wagtail can assign the image data to another variable using Django's ``as`` syntax:
 
 .. code-block:: django
 
     {% image self.photo width-400 as tmp_photo %}
 
-    <img src="{{ tmp_photo.src }}" width="{{ tmp_photo.width }}" 
+    <img src="{{ tmp_photo.url }}" width="{{ tmp_photo.width }}" 
         height="{{ tmp_photo.height }}" alt="{{ tmp_photo.alt }}" class="my-custom-class" />
+        
+
+.. Note::      
+    The image property used for the `src` attribute is actually `image.url`, not `image.src`.
+
 
 The ``attrs`` shortcut
 -----------------------
 
 .. versionadded:: 0.4
 
-You can also use the ``attrs`` property as a shorthand to output the ``src``, ``width``, ``height`` and ``alt`` attributes in one go:
+You can also use the ``attrs`` property as a shorthand to output the attributes ``src``, ``width``, ``height`` and ``alt`` in one go:
 
 .. code-block:: django
 

From 0987946786a41665cd7e664d8644591c27b4f2de Mon Sep 17 00:00:00 2001
From: Dave Cranwell <davecranwell@users.noreply.github.com>
Date: Thu, 10 Jul 2014 11:48:57 +0100
Subject: [PATCH 137/154] Update frontenddevelopers.rst

---
 docs/building_your_site/frontenddevelopers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index 8c3ffa479..e9c775d16 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -205,7 +205,7 @@ Extra attributes can be specified with the syntax ``attribute="value"``:
 No validation is performed on attributes added in this way so it's possible to add `src`, `width`, `height` and `alt` of your own that might conflict with those generated by the tag itself.
 
 
-**Generating the image "as foo" to access individual properties **
+**Generating the image "as foo" to access individual properties**
 
 Wagtail can assign the image data to another variable using Django's ``as`` syntax:
 

From f73c5416ba00c6a78050e7657f1dd93b6270805b Mon Sep 17 00:00:00 2001
From: Dave Cranwell <davecranwell@users.noreply.github.com>
Date: Thu, 10 Jul 2014 11:49:41 +0100
Subject: [PATCH 138/154] Update frontenddevelopers.rst

---
 docs/building_your_site/frontenddevelopers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index e9c775d16..1061856bb 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -218,7 +218,7 @@ Wagtail can assign the image data to another variable using Django's ``as`` synt
         
 
 .. Note::      
-    The image property used for the `src` attribute is actually `image.url`, not `image.src`.
+    The image property used for the ``src`` attribute is actually ``image.url``, not ``image.src``.
 
 
 The ``attrs`` shortcut

From 5faa0652a24cbb6ee0d66c4d965d4ace7ad34d2a Mon Sep 17 00:00:00 2001
From: Dave Cranwell <davecranwell@users.noreply.github.com>
Date: Thu, 10 Jul 2014 11:51:06 +0100
Subject: [PATCH 139/154] Update frontenddevelopers.rst

---
 docs/building_your_site/frontenddevelopers.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/building_your_site/frontenddevelopers.rst b/docs/building_your_site/frontenddevelopers.rst
index 1061856bb..a5120af19 100644
--- a/docs/building_your_site/frontenddevelopers.rst
+++ b/docs/building_your_site/frontenddevelopers.rst
@@ -192,7 +192,7 @@ More control over the ``img`` tag
 
 Wagtail provides two shorcuts to give greater control over the ``img`` element:
 
-**Adding attributes to the  {% image %} tag**
+**1. Adding attributes to the  {% image %} tag**
 
 .. versionadded:: 0.4
 
@@ -205,7 +205,7 @@ Extra attributes can be specified with the syntax ``attribute="value"``:
 No validation is performed on attributes added in this way so it's possible to add `src`, `width`, `height` and `alt` of your own that might conflict with those generated by the tag itself.
 
 
-**Generating the image "as foo" to access individual properties**
+**2. Generating the image "as foo" to access individual properties**
 
 Wagtail can assign the image data to another variable using Django's ``as`` syntax:
 

From 4f8cfa6346fd645af7a37cbaca3be9183d68b8b3 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 10 Jul 2014 12:57:56 +0100
Subject: [PATCH 140/154] version / date bump to 0.4 in changelog, setup.py and
 docs

---
 CHANGELOG.txt | 2 +-
 docs/conf.py  | 4 ++--
 setup.py      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e915ffb22..6dc5a8744 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-0.4 (xx.xx.20xx)
+0.4 (10.07.2014)
 ~~~~~~~~~~~~~~~~
  * ElasticUtils/pyelasticsearch swapped for elasticsearch-py
  * Python 3.2, 3.3 and 3.4 support
diff --git a/docs/conf.py b/docs/conf.py
index ba6525d1b..d54c30df7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -59,9 +59,9 @@ copyright = u'2014, Torchbox'
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.1'
+version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.1'
+release = '0.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 11c32d522..129a48468 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ if not PY3:
 
 setup(
     name='wagtail',
-    version='0.3.1',
+    version='0.4',
     description='A Django content management system focused on flexibility and user experience',
     author='Matthew Westcott',
     author_email='matthew.westcott@torchbox.com',

From f939af74dc5cf49056cce1e1fbf829ed0d2d9fe0 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 10 Jul 2014 13:33:20 +0100
Subject: [PATCH 141/154] Fix more doc syntax errors

---
 docs/index.rst                        | 1 +
 docs/releases/0.4.rst                 | 4 ++--
 docs/releases/index.rst               | 7 +++++++
 docs/search/backends.rst              | 2 +-
 docs/search/editors_picks.rst         | 2 +-
 docs/search/for_python_developers.rst | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 docs/releases/index.rst

diff --git a/docs/index.rst b/docs/index.rst
index a040fe767..2ab429eb6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -28,3 +28,4 @@ It supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 suppo
    support
    roadmap
    editor_manual/index
+   releases/index
diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index a53ca5463..3aa630603 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -32,7 +32,7 @@ A new management command has been added (:ref:`publish_scheduled_pages`) to publ
 Search on QuerySet with Elasticsearch
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Its now possible to perform searches with Elasticsearch on ``PageQuerySet``s:
+Its now possible to perform searches with Elasticsearch on ``PageQuerySet`` objects:
 
     >>> from wagtail.wagtailcore.models import Page
     >>> Page.objects.live().descendant_of(events_index).search("Hello")
@@ -174,7 +174,7 @@ Previously, the ``route`` method called ``serve`` and returned a ``HttpResponse`
 
 
 Wagtailadmins ``hooks`` module has moved to wagtailcore
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you use any ``wagtail_hooks.py`` files in your project, you may have an import like: ``from wagtail.wagtailadmin import hooks``
 
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
new file mode 100644
index 000000000..07bc8e888
--- /dev/null
+++ b/docs/releases/index.rst
@@ -0,0 +1,7 @@
+Release notes
+=============
+
+.. toctree::
+   :maxdepth: 1
+
+   0.4
\ No newline at end of file
diff --git a/docs/search/backends.rst b/docs/search/backends.rst
index eba6d8a1a..f03f06358 100644
--- a/docs/search/backends.rst
+++ b/docs/search/backends.rst
@@ -14,7 +14,7 @@ Wagtail can degrade to a database-backed text search, but we strongly recommend
 .. _wagtailsearch_backends_database:
 
 Database Backend
-===============
+================
 
 The default DB search backend uses Django's ``__icontains`` filter.
 
diff --git a/docs/search/editors_picks.rst b/docs/search/editors_picks.rst
index f899302b4..9ed41f3c5 100644
--- a/docs/search/editors_picks.rst
+++ b/docs/search/editors_picks.rst
@@ -1,5 +1,5 @@
 
-.. _wagtailsearch_editors_picks:
+.. _editors-picks:
 
 
 Editors picks
diff --git a/docs/search/for_python_developers.rst b/docs/search/for_python_developers.rst
index c73799a7a..7ff9a18dc 100644
--- a/docs/search/for_python_developers.rst
+++ b/docs/search/for_python_developers.rst
@@ -35,7 +35,7 @@ Fields need to be explicitly added to the search configuration in order for you
 
 You can add new fields to the search index by overriding the ``search_fields`` property and appending a list of extra ``SearchField``/``FilterField`` objects to it.
 
-``Page`` sets a default value to ``search_fields`` indexing the ``title`` field as a ``SearchField`` and some other generally useful fields as ``FilterField``s.
+The default value of ``search_fields`` (as set in ``Page``) indexes the ``title`` field as a ``SearchField`` and some other generally useful fields as ``FilterField`` rules.
 
 
 Quick example

From 91d449de1ba39c990be25325976ec47972c70fdb Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 10 Jul 2014 13:39:33 +0100
Subject: [PATCH 142/154] add changelog entry for private pages

---
 CHANGELOG.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6dc5a8744..a0abb58db 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Changelog
  * ElasticUtils/pyelasticsearch swapped for elasticsearch-py
  * Python 3.2, 3.3 and 3.4 support
  * Added scheduled publishing
+ * Added support for private (password-protected) pages
  * Added frontend cache invalidator
  * Added sitemap generator
  * Added notification preferences

From a9b247b7810fad4479f18f7b31d20cc16360d2e0 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 10 Jul 2014 15:47:14 +0100
Subject: [PATCH 143/154] more explicit instructions for migrating away from
 deprecated things

---
 docs/model_recipes.rst | 2 ++
 docs/releases/0.4.rst  | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/model_recipes.rst b/docs/model_recipes.rst
index 7f9b5f7b6..b8f006f99 100644
--- a/docs/model_recipes.rst
+++ b/docs/model_recipes.rst
@@ -38,6 +38,8 @@ Consider this example from the Wagtail demo site's ``models.py``, which serves a
 With this strategy, you could use Django or Python utilities to render your model in JSON or XML or any other format you'd like.
 
 
+.. _overriding_route_method:
+
 Adding Endpoints with Custom route() Methods
 --------------------------------------------
 
diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index 3aa630603..1e6dbd15d 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -158,19 +158,21 @@ The following template tag libraries have been renamed:
  * ``embed_filters`` => ``wagtailembeds_tags``
  * ``image_tags`` => ``wagtailimages_tags``
 
+The old names will continue to work, but output a ``DeprecationWarning`` - you are advised to update any ``{% load %}`` tags in your templates to refer to the new names.
+
 
 New search field configuration format
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-``indexed_fields`` is now deprecated and has been replaced by a new search field configuration format called ``search_fields``.
+``indexed_fields`` is now deprecated and has been replaced by a new search field configuration format called ``search_fields``. See :ref:`wagtailsearch_for_python_developers` for how to define a ``search_fields`` property on your models.
 
 
 ``Page.route`` method should now return a ``RouteResult``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Previously, the ``route`` method called ``serve`` and returned a ``HttpResponse`` object. This has now been split up so ``serve`` is called separately and ``route`` must now return a RouteResult object.
+Previously, the ``route`` method called ``serve`` and returned an ``HttpResponse`` object. This has now been split up so ``serve`` is called separately and ``route`` must now return a RouteResult object.
 
-:ref:`anatomy_of_a_wagtail_request`
+If you are overriding ``Page.route`` on any of your page models, you will need to update the method to return a ``RouteResult`` object. The old method of returning an ``HttpResponse`` will continue to work, but this will throw a ``DeprecationWarning`` and bypass the ``before_serve_page`` hook, which means in particular that :ref:`private_pages` will not work on those page types. See :ref:`overriding_route_method`.
 
 
 Wagtailadmins ``hooks`` module has moved to wagtailcore

From ea7db7ba976196c8102370c67aab3aded4e10b70 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 10 Jul 2014 16:28:51 +0100
Subject: [PATCH 144/154] add note about fixing old migrations that break on
 the expired column

---
 docs/releases/0.4.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index 1e6dbd15d..a2f78e20c 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -144,6 +144,16 @@ If you are using the elasticsearch backend, you must install the ``elasticsearch
     If you are using an older version of Elasticsearch (< 1.0) you must install ``elasticsearch`` version 0.4.x.
 
 
+Addition of ``expired`` column may break old data migrations involving pages
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The scheduled publishing mechanism adds an ``expired`` field to wagtailcore.Page, defaulting to False. Any application code working with Page objects should be unaffected, but any code that creates page records using direct SQL, or within existing South migrations using South's frozen ORM, will fail as this code will be unaware of the ``expired`` database column. To fix a South migration that fails in this way, add the following line to the ``'wagtailcore.page'`` entry at the bottom of the migration file:
+
+.. code-block:: python
+
+  'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+
+
 Deprecated features
 ===================
 

From 883d6534e90a1a38a04d26113e1b14604f5b6380 Mon Sep 17 00:00:00 2001
From: Tom Dyson <tom@torchbox.com>
Date: Thu, 10 Jul 2014 16:44:08 +0100
Subject: [PATCH 145/154] Typos in 0.4 release notes

---
 docs/releases/0.4.rst | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index a2f78e20c..afd8ccff5 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -3,14 +3,14 @@ Wagtail 0.4 release notes
 =========================
 
 
-Whats new
-=========
+What's new
+==========
 
 
 Private Pages
 ~~~~~~~~~~~~~
 
-Wagtail now supports password protecting pages on the frontend allowing sections of your website to be made private.
+Wagtail now supports password protecting pages on the frontend, allowing sections of your website to be made private.
 
 :ref:`private_pages`
 
@@ -26,13 +26,13 @@ Scheduled publishing
 
 Editors can now schedule pages to be published or unpublished at specified times.
 
-A new management command has been added (:ref:`publish_scheduled_pages`) to publish pages that have been scheduled by an Editor.
+A new management command has been added (:ref:`publish_scheduled_pages`) to publish pages that have been scheduled by an editor.
 
 
 Search on QuerySet with Elasticsearch
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Its now possible to perform searches with Elasticsearch on ``PageQuerySet`` objects:
+It's now possible to perform searches with Elasticsearch on ``PageQuerySet`` objects:
 
     >>> from wagtail.wagtailcore.models import Page
     >>> Page.objects.live().descendant_of(events_index).search("Hello")
@@ -58,7 +58,7 @@ A new module has been added (``wagtail.contrib.wagtailfrontendcache``) which inv
 Notification preferences
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Users can now decide which notifications they recieve from Wagtail using a new "Notification preferences" section located in the account settings.
+Users can now decide which notifications they receive from Wagtail using a new "Notification preferences" section located in the account settings.
 
 
 Minor features
@@ -114,22 +114,22 @@ Images
 Other
 -----
 
- * Added styleguide (mainly for wagtail developers)
+ * Added styleguide, for Wagtail developers
 
 
 Bug fixes
 ~~~~~~~~~
 
  * Animated GIFs are now coalesced before resizing
- * Wand backend clones images before modifying them
- * Admin breadcrumb now positioned correctly on mobile
- * Page chooser breadcrumb now updates the chooser modal instead of linking to Explorer
- * Embeds - Fixed crash when no HTML field is sent back from the embed provider
+ * The Wand backend clones images before modifying them
+ * The admin breadcrumb is now positioned correctly on mobile
+ * The page chooser breadcrumb now updates the chooser modal instead of linking to Explorer
+ * Embeds - fixed crash when no HTML field is sent back from the embed provider
  * Multiple sites with same hostname but different ports are now allowed
- * No longer possible to create multiple sites with ``is_default_site = True``
+ * It is no longer possible to create multiple sites with ``is_default_site = True``
 
 
-Backwards incompatible changes
+Backwards-incompatible changes
 ==============================
 
 

From 6c6cd98e1ffa5268106008ecbe1f3f4da8e686af Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 10 Jul 2014 17:08:54 +0100
Subject: [PATCH 146/154] Added 0.5 release notes

---
 docs/releases/0.5.rst | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 docs/releases/0.5.rst

diff --git a/docs/releases/0.5.rst b/docs/releases/0.5.rst
new file mode 100644
index 000000000..77e0cd7bd
--- /dev/null
+++ b/docs/releases/0.5.rst
@@ -0,0 +1,27 @@
+=========================
+Wagtail 0.5 release notes
+=========================
+
+.. note::
+
+    Wagtail 0.5 is currently in development.
+
+
+Whats new
+=========
+
+
+Minor features
+~~~~~~~~~~~~~~
+
+
+Bug fixes
+~~~~~~~~~
+
+
+Backwards incompatible changes
+==============================
+
+
+Deprecated features
+===================

From 46d8f6165922d60549531b8308dd93c862dd961f Mon Sep 17 00:00:00 2001
From: Dave Cranwell <davecranwell@users.noreply.github.com>
Date: Thu, 10 Jul 2014 17:11:03 +0100
Subject: [PATCH 147/154] Added contents

---
 docs/releases/0.4.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index afd8ccff5..64259a191 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -2,6 +2,9 @@
 Wagtail 0.4 release notes
 =========================
 
+.. contents:: Contents
+    :local:
+
 
 What's new
 ==========

From a7576faebdd210e06fa5e4e8285baab3fc158708 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <davecranwell@users.noreply.github.com>
Date: Thu, 10 Jul 2014 17:11:23 +0100
Subject: [PATCH 148/154] Added contents

---
 docs/releases/0.5.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/releases/0.5.rst b/docs/releases/0.5.rst
index 77e0cd7bd..a356571a5 100644
--- a/docs/releases/0.5.rst
+++ b/docs/releases/0.5.rst
@@ -2,6 +2,10 @@
 Wagtail 0.5 release notes
 =========================
 
+.. contents:: Contents
+    :local:
+
+
 .. note::
 
     Wagtail 0.5 is currently in development.

From d1285af5c52b39299960a44a080812d4ba7b76c6 Mon Sep 17 00:00:00 2001
From: Tom Dyson <tom@torchbox.com>
Date: Thu, 10 Jul 2014 17:20:48 +0100
Subject: [PATCH 149/154] python -> Python

---
 docs/search/for_python_developers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/search/for_python_developers.rst b/docs/search/for_python_developers.rst
index 7ff9a18dc..1cadbc8da 100644
--- a/docs/search/for_python_developers.rst
+++ b/docs/search/for_python_developers.rst
@@ -3,7 +3,7 @@
 
 
 =====================
-For python developers
+For Python developers
 =====================
 
 

From 1d802e35c4a26a7dfcd2120c95848ba7e5e97438 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <davecranwell@users.noreply.github.com>
Date: Thu, 10 Jul 2014 17:22:07 +0100
Subject: [PATCH 150/154] Update private_pages.rst

---
 docs/private_pages.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/private_pages.rst b/docs/private_pages.rst
index bfd20ee09..99b364176 100644
--- a/docs/private_pages.rst
+++ b/docs/private_pages.rst
@@ -21,7 +21,7 @@ This template will receive the same set of context variables that the blocked pa
  - **form** - A Django form object for the password prompt; this will contain a field named ``password`` as its only visible field. A number of hidden fields may also be present, so the page must loop over ``form.hidden_fields`` if not using one of Django's rendering helpers such as ``form.as_p``.
  - **action_url** - The URL that the password form should be submitted to, as a POST request.
 
-A basic template suitable for use as PASSWORD_REQUIRED_TEMPLATE might look like this:
+A basic template suitable for use as ``PASSWORD_REQUIRED_TEMPLATE`` might look like this:
 
  .. code-block:: django
 

From ce679fced36a7995aa1b98e6d0c4887166391d35 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 10 Jul 2014 17:21:42 +0100
Subject: [PATCH 151/154] Made contents a bit smaller

---
 docs/releases/0.4.rst | 3 ++-
 docs/releases/0.5.rst | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index 64259a191..0929935f6 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -2,8 +2,9 @@
 Wagtail 0.4 release notes
 =========================
 
-.. contents:: Contents
+.. contents::
     :local:
+    :depth: 1
 
 
 What's new
diff --git a/docs/releases/0.5.rst b/docs/releases/0.5.rst
index a356571a5..855ba6729 100644
--- a/docs/releases/0.5.rst
+++ b/docs/releases/0.5.rst
@@ -2,8 +2,9 @@
 Wagtail 0.5 release notes
 =========================
 
-.. contents:: Contents
+.. contents::
     :local:
+    :depth: 1
 
 
 .. note::

From 32be550ece1aa1c663dd93e6c6f01acd4fc87bfd Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 10 Jul 2014 17:24:42 +0100
Subject: [PATCH 152/154] Added 0.5 release notes to menu

---
 docs/releases/0.5.rst   | 6 +++---
 docs/releases/index.rst | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/releases/0.5.rst b/docs/releases/0.5.rst
index 855ba6729..78cf465cd 100644
--- a/docs/releases/0.5.rst
+++ b/docs/releases/0.5.rst
@@ -1,6 +1,6 @@
-=========================
-Wagtail 0.5 release notes
-=========================
+==========================================
+Wagtail 0.5 release notes - IN DEVELOPMENT
+==========================================
 
 .. contents::
     :local:
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index 07bc8e888..52e8b124d 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -4,4 +4,5 @@ Release notes
 .. toctree::
    :maxdepth: 1
 
-   0.4
\ No newline at end of file
+   0.4
+   0.5

From f60dd67d861de4ab180063be02d06050317bef4e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 10 Jul 2014 17:25:55 +0100
Subject: [PATCH 153/154] Put 0.5 above 0.4 in menu

---
 docs/releases/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index 52e8b124d..9f4e27a51 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -4,5 +4,5 @@ Release notes
 .. toctree::
    :maxdepth: 1
 
-   0.4
    0.5
+   0.4

From ab8bb0e5c671371c7ca72d65967715b13541ea13 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Thu, 10 Jul 2014 17:27:38 +0100
Subject: [PATCH 154/154] Removed redundant 'in development' notice

---
 docs/releases/0.5.rst | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/releases/0.5.rst b/docs/releases/0.5.rst
index 78cf465cd..4b436ddb8 100644
--- a/docs/releases/0.5.rst
+++ b/docs/releases/0.5.rst
@@ -7,11 +7,6 @@ Wagtail 0.5 release notes - IN DEVELOPMENT
     :depth: 1
 
 
-.. note::
-
-    Wagtail 0.5 is currently in development.
-
-
 Whats new
 =========