adds get variant queryset

laws-africa · Jul 16, 2024 · 6917286 · 6917286
1 parent d055402
commit 6917286
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/liiweb/views/legislation.py b/liiweb/views/legislation.py
@@ -26,7 +26,12 @@ def get_form(self):
             self.form_defaults = {"sort": "-date"}
         return super().get_form()
 
-    def filter_queryset(self, qs, filter_q=False):
+    def get_base_queryset(self, *args, **kwargs):
+        qs = super().get_base_queryset(*args, **kwargs)
+        qs = self.get_variant_queryset(qs)
+        return qs
+
+    def get_variant_queryset(self, qs):
         if self.variant == "all":
             pass
         elif self.variant == "repealed":
@@ -47,8 +52,6 @@ def filter_queryset(self, qs, filter_q=False):
                     datetime.date.today() - timedelta(days=365)
                 ).isoformat()
             )
-        qs = super().filter_queryset(qs, filter_q=filter_q)
-
         return qs
 
     def get_context_data(self, **kwargs):

diff --git a/peachjam/views/generic_views.py b/peachjam/views/generic_views.py
@@ -142,7 +142,7 @@ def add_facets(self, context):
         natures = list(
             doc_n
             for doc_n in self.form.filter_queryset(
-                self.get_queryset(), exclude="natures"
+                self.get_base_queryset(), exclude="natures"
             )
             .order_by()
             .values_list("nature__name", flat=True)
@@ -153,7 +153,7 @@ def add_facets(self, context):
             authors = list(
                 a
                 for a in self.form.filter_queryset(
-                    self.get_queryset(), exclude="authors"
+                    self.get_base_queryset(), exclude="authors"
                 )
                 .order_by()
                 .values_list("authors__name", flat=True)
@@ -162,13 +162,13 @@ def add_facets(self, context):
             )
 
         years = list(
-            self.form.filter_queryset(self.get_queryset(), exclude="years")
+            self.form.filter_queryset(self.get_base_queryset(), exclude="years")
             .order_by()
             .values_list("date__year", flat=True)
             .distinct()
         )
         taxonomies = list(
-            self.form.filter_queryset(self.get_queryset(), exclude="taxonomies")
+            self.form.filter_queryset(self.get_base_queryset(), exclude="taxonomies")
             .filter(taxonomies__topic__isnull=False)
             .order_by()
             .values_list("taxonomies__topic__name", flat=True)