1
0
mirror of https://github.com/django/django.git synced 2025-10-30 00:56:09 +00:00

[3.2.x] Refs #32682 -- Renamed use_distinct variable to may_have_duplicates.

QuerySet.distinct() is not the only way to avoid duplicate, it's also
not preferred.

Backport of cd74aad90e from main
This commit is contained in:
Mariusz Felisiak
2021-04-26 09:30:40 +02:00
parent 7ad7034054
commit fbea64b8ce
4 changed files with 23 additions and 15 deletions

View File

@@ -660,14 +660,16 @@ class PluggableSearchPersonAdmin(admin.ModelAdmin):
search_fields = ('name',)
def get_search_results(self, request, queryset, search_term):
queryset, use_distinct = super().get_search_results(request, queryset, search_term)
queryset, may_have_duplicates = super().get_search_results(
request, queryset, search_term,
)
try:
search_term_as_int = int(search_term)
except ValueError:
pass
else:
queryset |= self.model.objects.filter(age=search_term_as_int)
return queryset, use_distinct
return queryset, may_have_duplicates
class AlbumAdmin(admin.ModelAdmin):