File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -43,8 +43,8 @@ def filterset_class(self):
43
43
def filtering_args (self ):
44
44
return get_filtering_args_from_filterset (self .filterset_class , self .node_type )
45
45
46
- @staticmethod
47
- def merge_querysets (default_queryset , queryset ):
46
+ @classmethod
47
+ def merge_querysets (cls , default_queryset , queryset ):
48
48
# There could be the case where the default queryset (returned from the filterclass)
49
49
# and the resolver queryset have some limits on it.
50
50
# We only would be able to apply one of those, but not both
@@ -61,7 +61,7 @@ def merge_querysets(default_queryset, queryset):
61
61
low = default_queryset .query .low_mark or queryset .query .low_mark
62
62
high = default_queryset .query .high_mark or queryset .query .high_mark
63
63
default_queryset .query .clear_limits ()
64
- queryset = queryset & default_queryset
64
+ queryset = super ( cls , cls ). merge_querysets ( default_queryset , queryset )
65
65
queryset .query .set_limits (low , high )
66
66
return queryset
67
67
You can’t perform that action at this time.
0 commit comments