diff --git a/ReferenceDataApp/admin.py b/ReferenceDataApp/admin.py index d66f2c1..28a08f9 100644 --- a/ReferenceDataApp/admin.py +++ b/ReferenceDataApp/admin.py @@ -28,5 +28,5 @@ class Admin_Airport(Admin_Trans_BaseModel): 'international_name', 'enable', 'area_id', 'parsing_finished_DT', 'order', 'modifiedDT', 'createDT'] - search_fields = ['id', 'name_en', 'name_ru', 'city', 'iata_code', 'icao_code', 'international_name'] + search_fields = ['id', 'name_en', 'name_ru', 'city__name', 'city__country__name', 'iata_code', 'icao_code', 'international_name'] admin.site.register(Airport, Admin_Airport) \ No newline at end of file diff --git a/ReferenceDataApp/funcs.py b/ReferenceDataApp/funcs.py index 0cb7a46..a5ed13e 100644 --- a/ReferenceDataApp/funcs.py +++ b/ReferenceDataApp/funcs.py @@ -6,6 +6,9 @@ from django.db.models import Q def search_cities_in_db(search_str): + + + Q_obj = Q(name_en__icontains=search_str) | Q(name_ru__icontains=search_str) | \ Q(country__name_en__icontains=search_str) | Q(country__name_ru__icontains=search_str) res_data = City.objects.filter(Q_obj).values('id', 'name', 'country__name') diff --git a/RoutesApp/js_views.py b/RoutesApp/js_views.py index a01bd39..ae45e6d 100644 --- a/RoutesApp/js_views.py +++ b/RoutesApp/js_views.py @@ -41,11 +41,18 @@ def create_route_ajax(request): html = render_to_string('blocks/profile/b_new_route.html', Dict, request=request) return JsonResponse({'html': html}, status=400) + obj = form.save(commit=False) + obj.owner = request.user + obj.save() - + routes = Route.objects.filter(owner=request.user) + Dict = { + 'routes': routes + } + html = render_to_string('blocks/profile/b_my_routes.html', Dict, request=request) res_Dict = { - 'html': '!!!' + 'html': html } return JsonResponse(res_Dict)