From: mathieu Date: Wed, 11 May 2016 13:19:40 +0000 (+0200) Subject: Fix autocomplete location X-Git-Tag: 1.6.2^2~15^2~3^2~14 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=70b06e135ca0d858266b0d50141447d1c84bad8e;p=telemeta.git Fix autocomplete location --- diff --git a/telemeta/views/search.py b/telemeta/views/search.py index d6ee584f..33d173f7 100644 --- a/telemeta/views/search.py +++ b/telemeta/views/search.py @@ -173,8 +173,8 @@ def autocomplete(request): objets = [result.instruments for result in sqs] #instrus = [result.instruments for result in sqs] elif request.GET.get('attr', '') == "location": - sqs = sqs.filter(location_principal__startswith=request.GET.get('q', '')).filter_or(location_relation__startswith=request.GET.get('q', '')) - objets = [result.location_principal for result in sqs] + sqs = sqs.filter(SQ(location_principal__startswith=request.GET.get('q', ''))|SQ(location_relation__startswith=request.GET.get('q', ''))) + objets = [result.location_principal+result.location_relation for result in sqs] suggestions = [] for chaine in objets : #for chaine in instrus: