feat: added request to filterset class

HISTORY.rst

@@ -3,16 +3,24 @@
 History
 -------
 
+2.1.1 (2021-9-27)
++++++++++++++++++
+
+* Feat: added request to filterset class
+
 2.1.0 (2021-9-23)
 +++++++++++++++++
+
 * Feat: add get_queryset to (almost) all base views
 
 2.0.2 (2021-5-18)
 +++++++++++++++++
+
 * Fix: sidebar groups permissions 
 
 2.0.1 (2021-5-17)
 +++++++++++++++++
+
 * Fix: consistent alignment of data in detail view
 
 2.0.0 (2021-4-28)

README.rst

@@ -1,4 +1,3 @@
-============================
 Django Backoffice Extensions
 ============================
 

backoffice_extensions/__init__.py

@@ -1,7 +1,7 @@
 """Django app made to create backoffices to help the administration of a site, like
 the Django Admin site, but for final users.
 """
-__version__ = "2.1.0"
+__version__ = "2.1.1"
 
 
 default_app_config = "backoffice_extensions.apps.BackofficeAppConfig"

backoffice_extensions/mixins.py

@@ -120,7 +120,7 @@ def get_queryset(self) -> "QuerySet":
     def get(self, request, *args, **kwargs):
         items: "QuerySet" = self.get_queryset()
         if self.filterset_class:
-            _filter = self.filterset_class(request.GET, queryset=items)
+            _filter = self.filterset_class(request.GET, queryset=items, request=request)
             items = _filter.qs
         fields: List = [
             field[0] if isinstance(field, tuple) else field for field in self.fields

backoffice_extensions/views.py

@@ -6,7 +6,6 @@
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.db import models
 from django.db.models import ProtectedError
-from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.translation import gettext_lazy as _
 from django.views import View
@@ -82,12 +81,10 @@ def get_redirect_response(self, instance):
     def get(self, request, pk):
         model_class = self.get_model_class()
         queryset = self.get_queryset()
-
         if queryset:
             instance = get_object_or_404(queryset, pk=pk)
         else:
             instance = get_object_or_404(model_class, pk=pk)
-
         form = self.form_class(instance=instance)
         context = {"form": form, "instance": instance}
         context.update(self.get_extra_context())
@@ -113,7 +110,7 @@ class BackOfficeListView(LoginRequiredMixin, BackOfficeViewMixin, ListView):
 
     queryset: Optional[models.QuerySet] = None
     list_display: List = []
-    filterset_class = None
+    filterset_class: Optional[Type] = None
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -123,7 +120,9 @@ def get_queryset(self):
         """Uses the FilterSet class to filter the query."""
         queryset = super().get_queryset()
         if self.filterset_class:
-            self.filter = self.filterset_class(self.request.GET, queryset=queryset)
+            self.filter = self.filterset_class(
+                self.request.GET, queryset=queryset, request=self.request
+            )
             queryset = self.filter.qs
         return queryset
 
@@ -190,7 +189,6 @@ def perform_delete(self, instance):
     def get_object(self, pk: int) -> models.Model:
         """Gets the object, using the queryset if provided to add annotation fields."""
         queryset = self.get_queryset()
-
         if queryset:
             instance = get_object_or_404(queryset, pk=pk)
         else:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-backoffice-extensions"
-version = "2.1.0"
+version = "2.1.1"
 description = "A set of views, tools and helpers to create a backoffice using Django."
 readme = "README.rst"
 authors = ["Marcos Gabarda <marcos@dekalabs.com>"]