diff --git a/RoutesApp/js_views.py b/RoutesApp/js_views.py index 48d5db9..76ca4a4 100644 --- a/RoutesApp/js_views.py +++ b/RoutesApp/js_views.py @@ -27,6 +27,8 @@ def new_route_view_ajax(request): def get_routes_ajax(request): + from ReferenceDataApp.models import Airport, Country, City + if request.method != 'POST': raise Http404 @@ -34,6 +36,21 @@ def get_routes_ajax(request): routes = [] if request.user and request.user.is_authenticated: routes = Route.objects.filter(owner=request.user) + + for route in routes: + + if route.type_transport == 'avia': + route.from_airport = Airport.objects.get(id=route.from_address_point) + route.to_airport = Airport.objects.get(id=route.to_address_point) + route.from_city = route.from_airport.city + route.to_city = route.to_airport.city + else: + route.from_city = City.objects.get(id=route.from_address_point) + route.to_city = City.objects.get(id=route.to_address_point) + + route.from_country = route.from_city.country + route.to_country = route.from_city.country + Dict = { 'routes': routes }