From 87f11a99148e4555799c05e342ce2f93e5c5baf9 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Tue, 11 Jan 2022 14:28:34 +0100
Subject: [PATCH] # 61 Filter frontend

* optimizes minor parts of table-filter initialization and queryset passing
---
 compensation/tables.py  | 6 ++++--
 ema/tables.py           | 3 ++-
 intervention/filters.py | 1 -
 intervention/tables.py  | 3 ++-
 konova/utils/tables.py  | 4 +---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/compensation/tables.py b/compensation/tables.py
index df7ec3e..2784af2 100644
--- a/compensation/tables.py
+++ b/compensation/tables.py
@@ -67,7 +67,8 @@ class CompensationTable(BaseTable):
             data=request.GET,
             queryset=qs,
         )
-        super().__init__(request, self.filter, *args, **kwargs)
+        kwargs["queryset"] = self.filter.qs
+        super().__init__(request, *args, **kwargs)
 
     def render_id(self, value, record: Compensation):
         """ Renders the id column for a compensation
@@ -207,7 +208,8 @@ class EcoAccountTable(BaseTable):
             data=request.GET,
             queryset=qs,
         )
-        super().__init__(request, self.filter, *args, **kwargs)
+        kwargs["queryset"] = self.filter.qs
+        super().__init__(request, *args, **kwargs)
 
     def render_id(self, value, record: EcoAccount):
         """ Renders the id column for an eco account
diff --git a/ema/tables.py b/ema/tables.py
index 9055059..884bac5 100644
--- a/ema/tables.py
+++ b/ema/tables.py
@@ -65,7 +65,8 @@ class EmaTable(BaseTable):
             data=request.GET,
             queryset=qs,
         )
-        super().__init__(request, self.filter, *args, **kwargs)
+        kwargs["queryset"] = self.filter.qs
+        super().__init__(request, *args, **kwargs)
 
     def render_id(self, value, record: Ema):
         """ Renders the id column for a EMA
diff --git a/intervention/filters.py b/intervention/filters.py
index 1dad9d3..01a3abe 100644
--- a/intervention/filters.py
+++ b/intervention/filters.py
@@ -21,4 +21,3 @@ class InterventionTableFilter(AbstractTableFilter, GeoReferencedTableFilterMixin
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
diff --git a/intervention/tables.py b/intervention/tables.py
index 103d419..b0da7d0 100644
--- a/intervention/tables.py
+++ b/intervention/tables.py
@@ -71,7 +71,8 @@ class InterventionTable(BaseTable):
             data=request.GET,
             queryset=qs,
         )
-        super().__init__(request, self.filter, *args, **kwargs)
+        kwargs["queryset"] = self.filter.qs
+        super().__init__(request, *args, **kwargs)
 
     def render_id(self, value, record: Intervention):
         """ Renders the id column for an intervention
diff --git a/konova/utils/tables.py b/konova/utils/tables.py
index 9d0329f..6a3ef88 100644
--- a/konova/utils/tables.py
+++ b/konova/utils/tables.py
@@ -31,10 +31,8 @@ class BaseTable(tables.tables.Table):
             "class": "table table-hover table-responsive-md table-responsive-sm",
         }
 
-    def __init__(self, request: HttpRequest = None, filter_set=None, queryset=None, *args, **kwargs):
+    def __init__(self, request: HttpRequest = None, queryset=None, *args, **kwargs):
         self.user = request.user or None
-        if filter_set is not None:
-            queryset = filter_set.qs
         kwargs["data"] = queryset
         kwargs["request"] = request
         super().__init__(*args, **kwargs)