From e5e3785489b15a52560bd559ee370a14fce63fab Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Tue, 21 Feb 2017 15:02:28 +0200 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=B8=D0=BA=20=D0=B3=D0=BE?= =?UTF-8?q?=D1=80=D0=BE=D0=B4=D0=BE=D0=B2=20=D0=B0=20=D0=B0=D0=B4=D0=BC?= =?UTF-8?q?=D0=B8=D0=BD=D0=BA=D0=B5=20=D0=BD=D0=B0=D0=BF=D1=80=D1=8F=D0=BC?= =?UTF-8?q?=D1=83=D1=8E=20=D0=B2=20=D0=B1=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/city/admin.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/apps/city/admin.py b/apps/city/admin.py index fc5edef7..42f4fcf4 100644 --- a/apps/city/admin.py +++ b/apps/city/admin.py @@ -96,22 +96,12 @@ def city_change(request, url): def search_city(request): term = request.GET.get('term') - # if not term: - # qs = City.objects.language().filter(country=country)[:200] - # else: - # qs = City.objects.language().filter(country=country, translations__name__contains=term) - # result = [{'id': city.id, 'label': city.name} for city in qs] - - lang = get_language() + country = request.GET.get('country') if not term: - qs = SearchQuerySet().models(City).order_by('text')[:30] + qs = City.objects.language().filter(country=country)[:200] else: - qs = SearchQuerySet().models(City).autocomplete(content_auto=term.capitalize()).order_by('text')[:30] - result = [] - for item in qs: - label = get_by_lang(item, 'name', lang) - if label: - result.append({'id': item.pk, 'label': label}) + qs = City.objects.language().filter(country=country, translations__name__contains=term) + result = [{'id': city.id, 'label': city.name} for city in qs] return JsonResponse(json.dumps(result), content_type='application/json', safe=False)