Merge remote-tracking branch 'origin/master' into network-updates

ProjectTIER · Jan 31, 2019 · 0bb844d · 0bb844d
2 parents e8317e1 + 14790c9
commit 0bb844d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/project_tier/home/templatetags/homepage_tags.py b/project_tier/home/templatetags/homepage_tags.py
@@ -9,7 +9,8 @@
 def get_site_root(context):
     # NB this returns a wagtailcore.Page, not the implementation-specific model used
     # so object-comparison to self will return false as objects would differ
-    return context['request'].site.root_page
+    page = context.get('calling_page') or context.get('page')
+    return page.get_site().root_page
 
 def has_menu_children(page):
     return page.get_children().live().in_menu().exists()

diff --git a/project_tier/home/templatetags/navigation_tags.py b/project_tier/home/templatetags/navigation_tags.py
@@ -9,7 +9,8 @@
 def get_site_root(context):
     # NB this returns a wagtailcore.Page, not the implementation-specific model used
     # so object-comparison to self will return false as objects would differ
-    return context['request'].site.root_page
+    page = context.get('calling_page') or context.get('page')
+    return page.get_site().root_page
 
 
 def has_menu_children(page):