Skip to content

Fix #53 #54

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 3 commits into from
Feb 25, 2018
Merged

Fix #53 #54

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38ce0d1
Fix filterset behavior on multiple negative conditions
anatolyivanov Jan 25, 2018
42fe33c
Fix filterset behavior on multiple negative conditions: simplify
anatolyivanov Jan 25, 2018
2947c9d
Fix filterset behavior on multiple negative conditions: added comment
anatolyivanov Jan 25, 2018
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
9 changes: 7 additions & 2 deletions url_filter/backends/django.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,12 @@ def filter_by_specs(self, queryset):

if include:
queryset = queryset.filter(**include)
if exclude:
queryset = queryset.exclude(**exclude)

# Plain queryset.exclude(**exclude) would cause exclusion of ALL
# negative-matching objects. I.e. x!=1&y!=2 is equivalent
# to "NOT (x = 1 AND y = 2)" SQL, which is not an intuitive behavior.
# We chain .exclude to achieve "NOT (x = 1) AND NOT (y = 2)" instead.
for lookup, value in exclude.items():
queryset = queryset.exclude(**{lookup: value})

return queryset.distinct()