Filter listings by whether the page is public

Author: helenb

tbx/blog/feeds.py

@@ -14,7 +14,7 @@ class BlogFeed(Feed):
     description = "The latest news and views from Torchbox on the work we do, the web and the wider world"
 
     def items(self):
-        return BlogPage.objects.live().order_by("-date")[:10]
+        return BlogPage.objects.live().public().order_by("-date")[:10]
 
     def item_title(self, item):
         return item.title

tbx/blog/models.py

@@ -14,11 +14,7 @@
 from modelcluster.fields import ParentalManyToManyField
 from tbx.core.blocks import StoryBlock
 from tbx.core.utils.fields import StreamField
-from tbx.core.utils.models import (
-    ColourThemeMixin,
-    NavigationFields,
-    SocialFields,
-)
+from tbx.core.utils.models import ColourThemeMixin, NavigationFields, SocialFields
 from tbx.images.models import CustomImage
 from tbx.people.models import ContactMixin
 from tbx.taxonomy.models import Sector, Service
@@ -54,6 +50,7 @@ def blog_posts(self):
         # Get list of blog pages that are descendants of this page
         blog_posts = (
             BlogPage.objects.live()
+            .public()
             .descendant_of(self)
             .distinct()
             .prefetch_related(

tbx/core/templatetags/torchbox_tags.py

@@ -20,15 +20,15 @@ def get_googe_maps_key():
 
 @register.simple_tag
 def get_next_sibling_by_order(page):
-    sibling = page.get_next_siblings().live().first()
+    sibling = page.get_next_siblings().live().public().first()
 
     if sibling:
         return sibling.specific
 
 
 @register.simple_tag
 def get_prev_sibling_by_order(page):
-    sibling = page.get_prev_siblings().live().first()
+    sibling = page.get_prev_siblings().live().public().first()
 
     if sibling:
         return sibling.specific
@@ -37,7 +37,11 @@ def get_prev_sibling_by_order(page):
 @register.simple_tag
 def get_next_sibling_blog(page):
     sibling = (
-        BlogPage.objects.filter(date__lt=page.date).order_by("-date").live().first()
+        BlogPage.objects.filter(date__lt=page.date)
+        .order_by("-date")
+        .live()
+        .public()
+        .first()
     )
     if sibling:
         return sibling.specific
@@ -46,7 +50,11 @@ def get_next_sibling_blog(page):
 @register.simple_tag
 def get_prev_sibling_blog(page):
     sibling = (
-        BlogPage.objects.filter(date__gt=page.date).order_by("-date").live().last()
+        BlogPage.objects.filter(date__gt=page.date)
+        .order_by("-date")
+        .live()
+        .public()
+        .last()
     )
     if sibling:
         return sibling.specific

tbx/work/models.py

@@ -14,11 +14,7 @@
 from modelcluster.fields import ParentalManyToManyField
 from tbx.core.blocks import StoryBlock
 from tbx.core.utils.fields import StreamField
-from tbx.core.utils.models import (
-    ColourThemeMixin,
-    NavigationFields,
-    SocialFields,
-)
+from tbx.core.utils.models import ColourThemeMixin, NavigationFields, SocialFields
 from tbx.images.models import CustomImage
 from tbx.people.models import ContactMixin
 from tbx.taxonomy.models import Sector, Service
@@ -120,6 +116,7 @@ def related_works(self):
                 Q(related_sectors__in=sectors) | Q(related_services__in=services)
             )
             .live()
+            .public()
             .distinct()
             .order_by(F("date").desc(nulls_last=True))
             .exclude(pk=self.pk)[:4]
@@ -379,6 +376,7 @@ def works(self):
         pages = (
             self.get_children()
             .live()
+            .public()
             .type(HistoricalWorkPage, WorkPage)
             .specific()
             .prefetch_related(