Browse Source

Remove use of request.site / SiteMiddleware

Matt Westcott 4 years ago
parent
commit
3372510e60
2 changed files with 2 additions and 3 deletions
  1. 2 2
      bakerydemo/base/templatetags/navigation_tags.py
  2. 0 1
      bakerydemo/settings/base.py

+ 2 - 2
bakerydemo/base/templatetags/navigation_tags.py

@@ -1,6 +1,6 @@
 from django import template
 
-from wagtail.core.models import Page
+from wagtail.core.models import Page, Site
 
 from bakerydemo.base.models import FooterText
 
@@ -14,7 +14,7 @@ def get_site_root(context):
     # This returns a core.Page. The main menu needs to have the site.root_page
     # defined else will return an object attribute error ('str' object has no
     # attribute 'get_children')
-    return context['request'].site.root_page
+    return Site.find_for_request(context['request']).root_page
 
 
 def has_menu_children(page):

+ 0 - 1
bakerydemo/settings/base.py

@@ -76,7 +76,6 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
-    'wagtail.core.middleware.SiteMiddleware',
     'wagtail.contrib.redirects.middleware.RedirectMiddleware',
 
 ]