From 52459a16b15ac3da7d415de3a46217356c89ad6c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 15 Aug 2016 17:16:16 +0200 Subject: Operation: search on "code_patriarche" and "common_name" for autocomplete (refs #3153) --- archaeological_operations/views.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'archaeological_operations/views.py') diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index d9baa4b7a..baed806b3 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -102,12 +102,20 @@ def autocomplete_operation(request, non_closed=True): q = request.GET.get('term') query = Q() for q in q.split(' '): - extra = Q(towns__name__icontains=q) + extra = Q(towns__name__icontains=q) | Q(common_name__icontains=q) try: int(q) extra = extra | Q(year=q) | Q(operation_code=q) except ValueError: pass + if settings.COUNTRY == 'fr': + if q.startswith('OA'): + q = q[2:] + try: + int(q) + extra = extra | Q(code_patriarche__contains=q) + except ValueError: + pass query = query & extra if non_closed: query = query & Q(end_date__isnull=True) -- cgit v1.2.3