diff --git a/RoutesApp/admin.py b/RoutesApp/admin.py index 5789c13..715b9c6 100644 --- a/RoutesApp/admin.py +++ b/RoutesApp/admin.py @@ -2,7 +2,7 @@ from sets.admin import * from .models import * from django.contrib import admin -class Admin_Route(Admin_Trans_BaseModelViewPage): +class Admin_Route(Admin_Trans_BaseModel): list_display = [ 'id', 'type_transport', 'cargo_type', 'departure_DT', 'from_address_point', 'from_place', @@ -10,4 +10,6 @@ class Admin_Route(Admin_Trans_BaseModelViewPage): 'order', 'modifiedDT', 'createDT' ] + list_display_links = ['id'] + admin.site.register(Route,Admin_Route) diff --git a/templates/small_INCLUDES/carrier_card/inf_about_moving.html b/templates/small_INCLUDES/carrier_card/inf_about_moving.html index 091f189..7765f34 100644 --- a/templates/small_INCLUDES/carrier_card/inf_about_moving.html +++ b/templates/small_INCLUDES/carrier_card/inf_about_moving.html @@ -17,13 +17,13 @@
Откуда заберёт:
-
{% if route.type_transport == 'avia' %}{{ route.from_airport }}{% else %}{{ route.get_from_place_display }}{% endif %}
+
{% if route.from_place == 'airport' %}{{ route.from_airport }}{% else %}{{ route.get_from_place_display }}{% endif %}
Куда доставит:
-
{% if route.type_transport == 'avia' %}{{ route.to_airport }}{% else %}{{ route.get_to_place_display }}{% endif %}
+
{% if route.to_place == 'airport' %}{{ route.to_airport }}{% else %}{{ route.get_to_place_display }}{% endif %}