diff --git a/RoutesApp/admin.py b/RoutesApp/admin.py
index 4b5e77b..444eb7d 100644
--- a/RoutesApp/admin.py
+++ b/RoutesApp/admin.py
@@ -30,6 +30,7 @@ class Admin_Route(Admin_Trans_BaseModel):
]
search_fields = [
+ 'id',
'owner__first_name', 'owner__last_name', 'from_city__name', 'to_city__name', 'owner__email'
]
raw_id_fields = ['from_city', 'to_city']
diff --git a/RoutesApp/templatetags/routes_tags.py b/RoutesApp/templatetags/routes_tags.py
index c7a122c..088eb51 100644
--- a/RoutesApp/templatetags/routes_tags.py
+++ b/RoutesApp/templatetags/routes_tags.py
@@ -3,10 +3,38 @@ __author__ = 'SDE'
from django import template
from django.template.defaultfilters import stringfilter
from django.utils.safestring import mark_safe
+from django.utils.translation import gettext_lazy as _
register = template.Library()
+cargo_type_for_show = {
+ 'letter': _('Документы/письмо'),
+ 'package': _('Посылка'),
+ 'passenger': _('Попутчик'),
+ 'parcel': _('Бандероль'),
+ 'cargo': _('Груз'),
+}
+
+type_transport_for_show = {
+ 'road': _('Автоперевозка'),
+ 'avia': _('Авиатранспорт'),
+ '': _('Авто/Авиаперевозка'),
+}
+
+
+@register.filter
+@stringfilter
+def get_type_transport_for_show(value):
+ return mark_safe(type_transport_for_show[value])
+
+
+@register.filter
+@stringfilter
+def get_cargo_type_for_show(value):
+ return mark_safe(cargo_type_for_show[value])
+
+
@register.filter
@stringfilter
def get_splited_cargo_type(value):
diff --git a/templates/v2/content_widgets/w_route_card/route_card_info_data.html b/templates/v2/content_widgets/w_route_card/route_card_info_data.html
index 48ddd29..ae82068 100644
--- a/templates/v2/content_widgets/w_route_card/route_card_info_data.html
+++ b/templates/v2/content_widgets/w_route_card/route_card_info_data.html
@@ -1,5 +1,6 @@
{% load static %}
{% load i18n %}
+{% load routes_tags %}

@@ -9,7 +10,7 @@
{{ route.owner }}
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
-
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
+
{% trans "Тип посылки:" %}
{{ route.cargo_type|get_cargo_type_for_show }}

@@ -31,7 +32,7 @@
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
-
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
+
{% trans "Тип посылки:" %}
{{ route.cargo_type|get_cargo_type_for_show }}

diff --git a/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html b/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html
index b64906a..739a8b1 100644
--- a/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html
+++ b/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html
@@ -1,5 +1,6 @@
{% load static %}
{% load i18n %}
+{% load routes_tags %}

@@ -9,7 +10,7 @@
{{ route.owner }}
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
-
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
+
{% trans "Тип посылки:" %}
{{ route.cargo_type|get_cargo_type_for_show }}
@@ -52,7 +53,7 @@
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
-
{% trans "Тип посылки:" %}
{{ route.get_cargo_type_display }}
+
{% trans "Тип посылки:" %}
{{ route.cargo_type|get_cargo_type_for_show }}
{{ route.owner }}
diff --git a/templates/v2/content_widgets/w_route_card/route_card_route_data.html b/templates/v2/content_widgets/w_route_card/route_card_route_data.html
index a70a826..3873c4e 100644
--- a/templates/v2/content_widgets/w_route_card/route_card_route_data.html
+++ b/templates/v2/content_widgets/w_route_card/route_card_route_data.html
@@ -1,5 +1,6 @@
{% load static %}
{% load i18n %}
+{% load routes_tags %}
@@ -17,7 +18,7 @@
-
{{ route.get_type_transport_display }}
+
{{ route.type_transport|get_type_transport_for_show }}
{% if route.type_transport == '' %}

@@ -92,7 +93,7 @@
-
{{ route.get_type_transport_display }}
+
{{ route.type_transport|get_type_transport_for_show }}
{% if route.type_transport == '' %}