Skip to content

Commit 9e26aaf

Browse files
authored
Merge pull request #224 from camd/fix-select-related
Fix select_related with filtering
2 parents dfa0a06 + 95e28ba commit 9e26aaf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

graphene_django/filter/fields.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def filterset_class(self):
4343
def filtering_args(self):
4444
return get_filtering_args_from_filterset(self.filterset_class, self.node_type)
4545

46-
@staticmethod
47-
def merge_querysets(default_queryset, queryset):
46+
@classmethod
47+
def merge_querysets(cls, default_queryset, queryset):
4848
# There could be the case where the default queryset (returned from the filterclass)
4949
# and the resolver queryset have some limits on it.
5050
# We only would be able to apply one of those, but not both
@@ -61,7 +61,7 @@ def merge_querysets(default_queryset, queryset):
6161
low = default_queryset.query.low_mark or queryset.query.low_mark
6262
high = default_queryset.query.high_mark or queryset.query.high_mark
6363
default_queryset.query.clear_limits()
64-
queryset = queryset & default_queryset
64+
queryset = super(cls, cls).merge_querysets(default_queryset, queryset)
6565
queryset.query.set_limits(low, high)
6666
return queryset
6767

0 commit comments

Comments
 (0)