Skip to content

Fix select_related with filtering #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 13, 2017
Merged

Fix select_related with filtering #224

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69cec06
Fix select_related with filtering
Jul 21, 2017
1d76db8
Use super for base queryset logic
Oct 10, 2017
b8fb64d
Merge branch 'master' into fix-select-related
syrusakbary Nov 13, 2017
95e28ba
Merge branch 'master' into fix-select-related
syrusakbary Nov 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions graphene_django/filter/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def filterset_class(self):
def filtering_args(self):
return get_filtering_args_from_filterset(self.filterset_class, self.node_type)

@staticmethod
def merge_querysets(default_queryset, queryset):
@classmethod
def merge_querysets(cls, default_queryset, queryset):
# There could be the case where the default queryset (returned from the filterclass)
# and the resolver queryset have some limits on it.
# We only would be able to apply one of those, but not both
Expand All @@ -61,7 +61,7 @@ def merge_querysets(default_queryset, queryset):
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 = queryset & default_queryset
queryset = super(cls, cls).merge_querysets(default_queryset, queryset)
queryset.query.set_limits(low, high)
return queryset

Expand Down