Skip to content

Commit

Permalink
fix latest_expression_only for legislation view
Browse files Browse the repository at this point in the history
  • Loading branch information
longhotsummer committed Jul 15, 2024
1 parent 5bacb67 commit df6219b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 22 deletions.
4 changes: 2 additions & 2 deletions lawlibrary/views/legislation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
22 changes: 2 additions & 20 deletions liiweb/views/legislation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"]
Expand Down

0 comments on commit df6219b

Please sign in to comment.