Skip to content

Commit a917448

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 a917448

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

graphene_django/filter/fields.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ def filtering_args(self):
5555
def resolve_queryset(
5656
cls, connection, iterable, info, args, filtering_args, filterset_class
5757
):
58+
qs = super().resolve_queryset(connection, iterable, info, args)
5859
filter_kwargs = {k: v for k, v in args.items() if k in filtering_args}
5960
return filterset_class(
60-
data=filter_kwargs, queryset=iterable, request=info.context
61+
data=filter_kwargs, queryset=qs, request=info.context
6162
).qs
6263

6364
def get_queryset_resolver(self):

0 commit comments

Comments
 (0)