entrouvert
/
zoo
17
0
Fork 0
Code Issues Pull Requests Releases Activity

nanterre: corrige les derniers utilisateurs de .search_name(prenom, nom) (fixes #21664)

This commit is contained in:
Benjamin Dauvergne 2018-02-06 12:04:02 +01:00 committed by Thomas NOEL
parent 133e88b6e8
commit fddf9193ea
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zoo/zoo_nanterre/api_views.py
View File

@ -179,7 +179,7 @@ class SearchView(APIView):
email = request.GET.get('email', '').strip()
name_id = request.GET.get('NameID')
if prenom or nom:
search = search.search_name(prenom, nom)
search = search.search_name(u'%s %s' % (prenom, nom))
if date_de_naissance and search.match_birthdate(date_de_naissance):
search = search.search_birthdate(date_de_naissance)
if cle:

8
zoo/zoo_nanterre/duplicates.py
View File

@ -58,13 +58,9 @@ def find_duplicates(limit=None, base_limit=None, queryset=None, days=None, count
# search for duplicate based on the name
s = search.copy()
if first.content['nom_de_naissance']:
s = search.search_name(
first_name=first.content['prenoms'],
last_name=first.content['nom_de_naissance'])
s = search.search_name(u'%s %s' % (first.content['prenoms'], first.content['nom_de_naissance']))
if first.content['nom_d_usage']:
s = s.search_name(
first_name=first.content['prenoms'],
last_name=first.content['nom_d_usage'])
s = s.search_name(u'%s %s' % (first.content['prenoms'], first.content['nom_d_usage']))
if first.content.get('date_de_naissance'):
s = s.search_birthdate(
datetime.datetime.strptime(