Skip to content
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

Jump to bottom

Django4 #112

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Django4 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77db999
Fixed bug in which DISTINCT clauses were forcibly removed from suppli…
bernd-wechner Jan 28, 2019
4890822
Fixed a typo in the Makefile
bernd-wechner Jan 28, 2019
7489fb0
Update url_filter/backends/django.py
miki725 Jan 28, 2019
8b29e3a
Merge remote-tracking branch 'origin/master'
bernd-wechner Jan 28, 2019
f5c022a
Merge remote-tracking branch 'upstream/master'
bernd-wechner Feb 26, 2021
eef1d00
Django 4 Incompatibility fixed
bernd-wechner Mar 1, 2022
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
3 changes: 2 additions & 1 deletion url_filter/backends/django.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ def filter_by_specs(self, queryset):
queryset = queryset.exclude(**{lookup: value})

to_many = self._is_any_to_many()
return queryset.distinct() if to_many and (include or exclude) else queryset
is_distinct = bool(queryset.query.distinct_fields)
return queryset.distinct() if (not is_distinct) and to_many and (include or exclude) else queryset

def _is_any_to_many(self):
return any(
Expand Down
6 changes: 3 additions & 3 deletions url_filter/validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MinLengthValidator as _MinLengthValidator,
)
from django.utils.deconstruct import deconstructible
from django.utils.translation import ungettext_lazy
from django.utils.translation import ngettext_lazy


@deconstructible
Expand All @@ -16,7 +16,7 @@ class MinLengthValidator(_MinLengthValidator):
"""

code = "min_length"
message = ungettext_lazy(
message = ngettext_lazy(
"Ensure this value has at least %(limit_value)d items (it has %(show_value)d).",
"Ensure this value has at least %(limit_value)d items (it has %(show_value)d).",
"limit_value",
Expand All @@ -36,7 +36,7 @@ class MaxLengthValidator(_MaxLengthValidator):
"""

code = "max_length"
message = ungettext_lazy(
message = ngettext_lazy(
"Ensure this value has at most %(limit_value)d items (it has %(show_value)d).",
"Ensure this value has at most %(limit_value)d items (it has %(show_value)d).",
"limit_value",
Expand Down