Fallback to the request site if no public site

opentech/public/navigation/templatetags/navigation_tags.py

@@ -13,7 +13,7 @@ esi_inclusion_tag = register_inclusion_tag(register)
 @esi_inclusion_tag('navigation/primarynav.html')
 def primarynav(context):
     request = context['request']
-    site = context['PUBLIC_SITE']
+    site = context.get('PUBLIC_SITE', request.site)
     return {
         'primarynav': NavigationSettings.for_site(site).primary_navigation,
         'request': request,
@@ -24,7 +24,7 @@ def primarynav(context):
 @esi_inclusion_tag('navigation/secondarynav.html')
 def secondarynav(context):
     request = context['request']
-    site = context['PUBLIC_SITE']
+    site = context.get('PUBLIC_SITE', request.site)
     return {
         'secondarynav': NavigationSettings.for_site(site).secondary_navigation,
         'request': request,
@@ -35,7 +35,7 @@ def secondarynav(context):
 @esi_inclusion_tag('navigation/footernav.html')
 def footernav(context):
     request = context['request']
-    site = context['PUBLIC_SITE']
+    site = context.get('PUBLIC_SITE', request.site)
     return {
         'footernav': NavigationSettings.for_site(site).footer_navigation,
         'request': request,
@@ -55,7 +55,7 @@ def sidebar(context):
 @esi_inclusion_tag('navigation/footerlinks.html')
 def footerlinks(context):
     request = context['request']
-    site = context['PUBLIC_SITE']
+    site = context.get('PUBLIC_SITE', request.site)
     return {
         'footerlinks': NavigationSettings.for_site(site).footer_links,
         'request': request,