Fix autocomplete location

diff --git a/telemeta/views/search.py b/telemeta/views/search.py
index d6ee584f9469cf733c8875e5d1d70572ec10271a..33d173f799b03496ee3f5c7d9bfbadbab8b3b40a 100644 (file)
--- 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: