From df6219be417bcd60a02b34042f09c8d0b2c1458a Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Mon, 15 Jul 2024 13:02:13 +0200 Subject: [PATCH] fix latest_expression_only for legislation view --- lawlibrary/views/legislation.py | 4 ++-- liiweb/views/legislation.py | 22 ++-------------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/lawlibrary/views/legislation.py b/lawlibrary/views/legislation.py index 01257392c..54850e423 100644 --- a/lawlibrary/views/legislation.py +++ b/lawlibrary/views/legislation.py @@ -10,8 +10,8 @@ class LegislationListView(BaseLegislationListView): - def get_queryset(self): - return super().get_queryset().filter(locality=None) + def get_base_queryset(self): + return super().get_base_queryset().filter(locality=None) class LocalityLegislationView(BaseLocalityLegislationView): diff --git a/liiweb/views/legislation.py b/liiweb/views/legislation.py index cd5fcd5f2..f0ceaaaee 100644 --- a/liiweb/views/legislation.py +++ b/liiweb/views/legislation.py @@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic import TemplateView -from peachjam.helpers import chunks, get_language +from peachjam.helpers import chunks from peachjam.models import JurisdictionProfile, Legislation, Locality, pj_settings from peachjam.views import FilteredDocumentListView @@ -19,27 +19,9 @@ class LegislationListView(FilteredDocumentListView): queryset = Legislation.objects.prefetch_related( "taxonomies", "taxonomies__topic", "work" ) + latest_expression_only = True extra_context = {"doc_table_citations": True, "legislation_list_sort": "title"} - def get_queryset(self): - qs = super().get_queryset() - qs = ( - qs.exclude(published=False) - .distinct( - "title", - "work_frbr_uri", - ) - .order_by( - "title", - "work_frbr_uri", - "-date", - "language__pk", - ) - .preferred_language(get_language(self.request)) - ) - - return qs - def get_template_names(self): if self.request.htmx: return ["peachjam/_document_table.html"]