Skip to content

Commit 132c4cb

Browse files
author
sierreis
committed
Fixed so that GrapheneFilterSetMixin is used with any provided filterset_class
1 parent 4d905a4 commit 132c4cb

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

graphene_django/filter/fields.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,16 @@ def args(self, args):
3535
@property
3636
def filterset_class(self):
3737
if not self._filterset_class:
38-
if not self.node_type._meta.filterset_class:
39-
fields = self._fields or self.node_type._meta.filter_fields
40-
meta = dict(model=self.model, fields=fields)
41-
if self._extra_filter_meta:
42-
meta.update(self._extra_filter_meta)
38+
fields = self._fields or self.node_type._meta.filter_fields
39+
meta = dict(model=self.model, fields=fields)
40+
if self._extra_filter_meta:
41+
meta.update(self._extra_filter_meta)
4342

44-
self._filterset_class = get_filterset_class(
45-
self._provided_filterset_class, **meta
46-
)
47-
else:
48-
self._filterset_class = self.node_type._meta.filterset_class
43+
filterset_class = self._provided_filterset_class or (
44+
self.node_type._meta.filterset_class)
45+
self._filterset_class = get_filterset_class(
46+
filterset_class, **meta
47+
)
4948

5049
return self._filterset_class
5150

0 commit comments

Comments
 (0)