custom_user: exclude deleted users from duplicates (#47353)
This commit is contained in:
parent
29e7b8e49d
commit
b6b6652156
|
@ -87,7 +87,8 @@ class UserQuerySet(models.QuerySet):
|
|||
name = '%s %s' % (first_name, last_name)
|
||||
name = unicodedata.normalize('NFKD', name).encode('ascii', 'ignore').decode('ascii').lower()
|
||||
|
||||
qs = self.annotate(name=Lower(Unaccent(ImmutableConcat('first_name', Value(' '), 'last_name'))))
|
||||
qs = self.filter(deleted__isnull=True)
|
||||
qs = qs.annotate(name=Lower(Unaccent(ImmutableConcat('first_name', Value(' '), 'last_name'))))
|
||||
qs = qs.filter(name__trigram_similar=name)
|
||||
qs = qs.annotate(dist=TrigramDistance('name', name))
|
||||
qs = qs.order_by('dist')
|
||||
|
|
Loading…
Reference in New Issue