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