diff --git a/liiweb/views/legislation.py b/liiweb/views/legislation.py index a74d299e2..7cf1c46ee 100644 --- a/liiweb/views/legislation.py +++ b/liiweb/views/legislation.py @@ -20,7 +20,7 @@ class LegislationListView(BaseLegislationListView): def get_form(self): self.form_defaults = {"sort": "title"} if self.variant in ["recent", "subleg"]: - self.form_defaults = {"sort": "-date"} + self.form_defaults = {"sort": "-date", "secondary_sort": "-frbr_uri_number"} return super().get_form() def get_base_queryset(self, *args, **kwargs): diff --git a/peachjam/forms.py b/peachjam/forms.py index aa54b7e73..bb186d889 100644 --- a/peachjam/forms.py +++ b/peachjam/forms.py @@ -216,6 +216,10 @@ def filter_queryset(self, queryset, exclude=None, filter_q=False): def order_queryset(self, queryset, exclude=None): sort = self.cleaned_data.get("sort") or "-date" + if sort == "-date" and "frbr_uri_number" in self.secondary_sort: + self.secondary_sort = "-frbr_uri_number" + elif sort == "date" and "frbr_uri_number" in self.secondary_sort: + self.secondary_sort = "frbr_uri_number" queryset = queryset.order_by(sort, self.secondary_sort) return queryset