Skip to content

Commit 3bfab99

Browse files
committed
Keep original queryset on DjangoFilterConnectionField
The PR #796 broke DjangoFilterConnectionField making it always get the raw queryset from the model to apply the filters in it. This makes sure that the DjangoObjectType's .get_queryset is called, keeping any filtering it might have made.
1 parent e82a2d7 commit 3bfab99

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

graphene_django/filter/fields.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ def filtering_args(self):
5555
def resolve_queryset(
5656
cls, connection, iterable, info, args, filtering_args, filterset_class
5757
):
58+
qs = super(DjangoFilterConnectionField, cls).resolve_queryset(
59+
connection, iterable, info, args
60+
)
5861
filter_kwargs = {k: v for k, v in args.items() if k in filtering_args}
59-
return filterset_class(
60-
data=filter_kwargs, queryset=iterable, request=info.context
61-
).qs
62+
return filterset_class(data=filter_kwargs, queryset=qs, request=info.context).qs
6263

6364
def get_queryset_resolver(self):
6465
return partial(

0 commit comments

Comments
 (0)