sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.8.35 order for city / country

Browse Source
This commit is contained in:
SDE
2023-12-05 13:25:31 +03:00
parent 12af0ea238
commit fc194d3f85
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReferenceDataApp/js_views.py
View File

@@ -55,7 +55,7 @@ def get_address_point_ajax(request):
else: else:
item['city_name'] = item['name'] item['city_name'] = item['name']
item['country_name'] = item['country__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)}" html = f"{html}{render_to_string('widgets/w_ac_input_address_point.html', item)}"
i += 1 i += 1

4
RoutesApp/models.py
View File

@@ -111,8 +111,8 @@ class Route(BaseModel):
to_address_point_Dict = to_address_point_objs.values( to_address_point_Dict = to_address_point_objs.values(
'id', 'name', 'country__name')[0] 'id', 'name', 'country__name')[0]
from_address_point_txt = f'{from_address_point_Dict["country__name"]} / {from_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["country__name"]} / {to_address_point_Dict["name"]}' to_address_point_txt = f'{to_address_point_Dict["name"]} / {to_address_point_Dict["country__name"]}'
return { return {
'from_address_point_obj': from_address_point_objs[0], 'from_address_point_obj': from_address_point_objs[0],