From e1cf455384d3481e2d1088fa6449e1617ef88331 Mon Sep 17 00:00:00 2001 From: bkfox Date: Thu, 1 Feb 2024 19:45:14 +0100 Subject: [PATCH] page glitch --- aircox/templates/aircox/widgets/page.html | 2 +- aircox/views/page.py | 6 +----- aircox/views/program.py | 6 ------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/aircox/templates/aircox/widgets/page.html b/aircox/templates/aircox/widgets/page.html index 2285821..4961ef1 100644 --- a/aircox/templates/aircox/widgets/page.html +++ b/aircox/templates/aircox/widgets/page.html @@ -37,7 +37,7 @@ {% block actions %} {% if url and "card" not in widget_template %} -{% translate "Show" %} +{% translate "Show" %} {% endif %} {{ block.super }} {% endblock %} diff --git a/aircox/views/page.py b/aircox/views/page.py index e6cbc51..0713a38 100644 --- a/aircox/views/page.py +++ b/aircox/views/page.py @@ -22,11 +22,7 @@ class BasePageMixin: category = None def get_queryset(self): - query = super().get_queryset().select_subclasses() - user = self.request.user - if not user.is_staff: - query = query.published() - return query.select_related("cover") + return super().get_queryset().select_subclasses().published().select_related("cover") def get_category(self, page, **kwargs): if page: diff --git a/aircox/views/program.py b/aircox/views/program.py index 384f3fc..c66b397 100644 --- a/aircox/views/program.py +++ b/aircox/views/program.py @@ -13,9 +13,6 @@ class BaseProgramMixin: def get_program(self): return self.object - def get_sidebar_url(self): - return reverse("program-page-list", kwargs={"parent_slug": self.program.slug}) - def get_context_data(self, **kwargs): self.program = self.get_program() kwargs["program"] = self.program @@ -69,9 +66,6 @@ class ProgramPageDetailView(BaseProgramMixin, ParentMixin, PageDetailView): self.parent = self.object.program return self.object.program - def get_sidebar_queryset(self): - return super().get_sidebar_queryset().filter(parent=self.program) - class ProgramPageListView(BaseProgramMixin, PageListView): model = Page