Projet

Général

Profil

0001-custom_user-exclude-deleted-users-from-duplicates-47.patch

Valentin Deniaud, 05 octobre 2020 16:26

Télécharger (1,15 ko)

Voir les différences: 

Subject: [PATCH] custom_user: exclude deleted users from duplicates (#47353)


 src/authentic2/custom_user/managers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
src/authentic2/custom_user/managers.py
87 87 
        name = '%s %s' % (first_name, last_name)
88 88 
        name = unicodedata.normalize('NFKD', name).encode('ascii', 'ignore').decode('ascii').lower()
89 89 

  		




  90
  
  
    
        qs = self.annotate(name=Lower(Unaccent(ImmutableConcat('first_name', Value(' '), 'last_name'))))

  		




  
  90
  
    
        qs = self.filter(deleted__isnull=True)

  		




  
  91
  
    
        qs = qs.annotate(name=Lower(Unaccent(ImmutableConcat('first_name', Value(' '), 'last_name'))))

  		




  91
  92
  
    
        qs = qs.filter(name__trigram_similar=name)

  		




  92
  93
  
    
        qs = qs.annotate(dist=TrigramDistance('name', name))

  		




  93
  94
  
    
        qs = qs.order_by('dist')

  		




  94
  
  
    
-