Fix for Wagtail 2.11a0 (#58)

Co-authored-by: Loic Teixeira <[email protected]>
wagtail-nest · Oct 16, 2020 · 4a451ca · 4a451ca
1 parent bc9f7e7
commit 4a451ca
Showing 8 changed files with 26 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased](https://github.com/wagtail/wagtail-bakery/compare/0.4.0...HEAD)
 
+### Added
+
+- Compatibility with Wagtail 2.11 (#58)
+
 ### Removed
 
 - Drop support for Wagtail < 2.7

diff --git a/examples/aws/example/settings.py b/examples/aws/example/settings.py
@@ -75,7 +75,6 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
-    'wagtail.core.middleware.SiteMiddleware',
     'wagtail.contrib.redirects.middleware.RedirectMiddleware',
 ]
 

diff --git a/examples/multisite/example/settings.py b/examples/multisite/example/settings.py
@@ -70,7 +70,6 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
-    'wagtail.core.middleware.SiteMiddleware',
     'wagtail.contrib.redirects.middleware.RedirectMiddleware',
 ]
 

diff --git a/examples/multisite/example/templates/base.html b/examples/multisite/example/templates/base.html
@@ -1,4 +1,4 @@
-{% load static %}
+{% load static wagtailcore_tags %}
 
 <!DOCTYPE HTML>
 <html>
@@ -18,7 +18,8 @@
         {% endblock %}
         {% block title %}
         <h1>{{ self.title }}</h1>
-        <h2>{{ request.site.hostname }}</h2>
+        {% wagtail_site as current_site %}
+        <h2>{{ current_site.hostname }}</h2>
         {% endblock %}
         {% block content %}{% endblock %}
     </body>

diff --git a/examples/site/example/settings.py b/examples/site/example/settings.py
@@ -70,7 +70,6 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
-    'wagtail.core.middleware.SiteMiddleware',
     'wagtail.contrib.redirects.middleware.RedirectMiddleware',
 ]
 

diff --git a/src/wagtailbakery/api_views.py b/src/wagtailbakery/api_views.py
@@ -5,6 +5,7 @@
 from bakery.views import BuildableMixin
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
+from wagtail import VERSION as WAGTAIL_VERSION
 from wagtail.api.v2.router import WagtailAPIRouter
 from wagtail.core.models import Page, Site
 
@@ -101,7 +102,8 @@ def unbuild_object(self, obj):
     def get_content(self, obj):
         # Create a dummy request
         request = self.create_request('/?format=json&fields=*')
-        request.site = Site.objects.get(is_default_site=True)
+        if WAGTAIL_VERSION < (2, 9):
+            request.site = Site.objects.get(is_default_site=True)
         request.wagtailapi_router = WagtailAPIRouter('')
 
         response = self.endpoint_class.as_view({'get': 'detail_view'})(request, pk=obj.pk)
@@ -147,7 +149,8 @@ def fetch_page_listing(self, page_num, model=None):
             url = '/?format=json&fields=*&limit={}&offset={}'.format(self.results_per_page, self.results_per_page * page_num)
 
         request = self.create_request(url)
-        request.site = Site.objects.get(is_default_site=True)
+        if WAGTAIL_VERSION < (2, 9):
+            request.site = Site.objects.get(is_default_site=True)
         request.wagtailapi_router = WagtailAPIRouter('')
         response = PagesAPIViewSet.as_view({'get': 'listing_view'})(request)
 

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,6 +1,7 @@
 import os
 
 from django.conf import settings
+from wagtail import VERSION as WAGTAIL_VERSION
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -21,10 +22,15 @@ def pytest_configure():
         'wagtail.admin',
         'wagtail.core',
     ]
-    wagtail_middleware = [
-        'wagtail.core.middleware.SiteMiddleware',
-        'wagtail.contrib.redirects.middleware.RedirectMiddleware',
-    ]
+    if WAGTAIL_VERSION >= (2, 9):
+        wagtail_middleware = [
+            'wagtail.contrib.redirects.middleware.RedirectMiddleware',
+        ]
+    else:
+        wagtail_middleware = [
+            'wagtail.core.middleware.SiteMiddleware',
+            'wagtail.contrib.redirects.middleware.RedirectMiddleware',
+        ]
 
     settings.configure(
         DATABASES={

diff --git a/tests/integration/test_api_views.py b/tests/integration/test_api_views.py
@@ -1,6 +1,7 @@
 import json
 
 import pytest
+from wagtail import VERSION as WAGTAIL_VERSION
 
 from wagtailbakery.api_views import (
     PagesAPIDetailView, PagesAPIListingView, TypedPagesAPIListingView)
@@ -10,6 +11,9 @@
 DEFAULT_PAGE_FIELDS = {'id', 'meta', 'title'}
 DEFAULT_PAGE_META_FIELDS = {'type', 'show_in_menus', 'search_description', 'first_published_at', 'slug', 'html_url', 'seo_title'}
 
+if WAGTAIL_VERSION >= (2, 11):
+    DEFAULT_PAGE_META_FIELDS.add('locale')
+
 
 @pytest.mark.django_db
 def test_wagtail_bakery_pages_api_detail_view(page_tree):