work on pages, filters, lists

aircox/views/program.py

@@ -1,11 +1,13 @@
+from django.db.models import Q
 from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import get_object_or_404
 
-from aircox.models import Episode, Program
+from ..models import Episode, Program, Page
+from .mixins import ParentMixin
 from .page import PageDetailView, PageListView
 
 
-__all__ = ['ProgramPageDetailView', 'ProgramDetailView']
+__all__ = ['ProgramPageDetailView', 'ProgramDetailView', 'ProgramPageListView']
 
 
 class ProgramPageDetailView(PageDetailView):
@@ -13,24 +15,25 @@ class ProgramPageDetailView(PageDetailView):
     Base view class for a page that is displayed as a program's child page.
     """
     program = None
-    show_side_nav = True
+    has_sidebar = True
     list_count = 5
 
-    def get_side_queryset(self):
-        return self.program.episode_set.published().order_by('-date')
+    def get_sidebar_queryset(self):
+        return super().get_sidebar_queryset().filter(parent=self.object)
+
+
+class ProgramPageListView(ParentMixin, PageListView):
+    model = Page
+    parent_model = Program
+    queryset = Page.objects.select_subclasses()
 
 
 class ProgramDetailView(ProgramPageDetailView):
     model = Program
 
-    def get_articles_queryset(self):
-        return self.program.article_set.published().order_by('-date')
-
     def get_context_data(self, **kwargs):
         self.program = kwargs.setdefault('program', self.object)
-        if 'articles' not in kwargs:
-            kwargs['articles'] = \
-                self.get_articles_queryset()[:self.list_count]
         return super().get_context_data(**kwargs)
 
 
+