From fc194d3f85183a040d99c7dded46c65e72ad2a7b Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 5 Dec 2023 13:25:31 +0300 Subject: [PATCH] 0.8.35 order for city / country --- ReferenceDataApp/js_views.py | 2 +- RoutesApp/models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ReferenceDataApp/js_views.py b/ReferenceDataApp/js_views.py index 8cc66bf..2d94c37 100644 --- a/ReferenceDataApp/js_views.py +++ b/ReferenceDataApp/js_views.py @@ -55,7 +55,7 @@ def get_address_point_ajax(request): else: item['city_name'] = item['name'] item['country_name'] = item['country__name'] - item['fullname'] = f'{item["country_name"]} / {item["city_name"]}' + item['fullname'] = f'{item["city_name"]} / {item["country_name"]}' html = f"{html}{render_to_string('widgets/w_ac_input_address_point.html', item)}" i += 1 diff --git a/RoutesApp/models.py b/RoutesApp/models.py index 6172981..3f1d39a 100644 --- a/RoutesApp/models.py +++ b/RoutesApp/models.py @@ -111,8 +111,8 @@ class Route(BaseModel): to_address_point_Dict = to_address_point_objs.values( 'id', 'name', 'country__name')[0] - from_address_point_txt = f'{from_address_point_Dict["country__name"]} / {from_address_point_Dict["name"]}' - to_address_point_txt = f'{to_address_point_Dict["country__name"]} / {to_address_point_Dict["name"]}' + from_address_point_txt = f'{from_address_point_Dict["name"]} / {from_address_point_Dict["country__name"]}' + to_address_point_txt = f'{to_address_point_Dict["name"]} / {to_address_point_Dict["country__name"]}' return { 'from_address_point_obj': from_address_point_objs[0],