From 1db1cbdd9ca9d3dc62158e8a5ecd03b7fc8d1e51 Mon Sep 17 00:00:00 2001 From: Samuel Cormier-Iijima Date: Mon, 13 Nov 2017 12:47:55 -0500 Subject: [PATCH 1/2] Fix passing request context to filterset creation Currently this code throws an error about `context` not being defined. --- graphene_django/filter/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphene_django/filter/fields.py b/graphene_django/filter/fields.py index ae6f6a6..cf53ea3 100644 --- a/graphene_django/filter/fields.py +++ b/graphene_django/filter/fields.py @@ -73,7 +73,7 @@ class DjangoFilterConnectionField(DjangoConnectionField): qs = filterset_class( data=filter_kwargs, queryset=default_manager.get_queryset(), - request=context + request=info.context ).qs return super(DjangoFilterConnectionField, cls).connection_resolver( From 3f08ed629ccd1ddb0d8e7630fc8fe3a2a8f085a6 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 13 Nov 2017 14:56:25 -0500 Subject: [PATCH 2/2] Fix infinite recursion when sublassing DjangoFilterConnectionField and merging querysets --- graphene_django/filter/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphene_django/filter/fields.py b/graphene_django/filter/fields.py index ae6f6a6..f9297b6 100644 --- a/graphene_django/filter/fields.py +++ b/graphene_django/filter/fields.py @@ -61,7 +61,7 @@ class DjangoFilterConnectionField(DjangoConnectionField): low = default_queryset.query.low_mark or queryset.query.low_mark high = default_queryset.query.high_mark or queryset.query.high_mark default_queryset.query.clear_limits() - queryset = super(cls, cls).merge_querysets(default_queryset, queryset) + queryset = super(DjangoFilterConnectionField, cls).merge_querysets(default_queryset, queryset) queryset.query.set_limits(low, high) return queryset