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

2.1.17 route form

Browse Source
This commit is contained in:
SDE
2025-01-14 19:56:36 +03:00
parent a0b08a9a94
commit 8ac11d6234
9 changed files with 58 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
RoutesApp/js_views.py
View File

@@ -173,7 +173,7 @@ def edit_route_ajax(request):
route = Route.objects.get(id=data['route_id'])
form = RouteForm(instance=route)
form = RouteForm(instance=route, owner_type=route.owner_type)
form = get_cargo_types_by_type_transport(route.type_transport, form)
# routeForm_assign_choices_by_type_transport(form, route.type_transport)
@@ -381,8 +381,8 @@ def create_or_change_route_ajax(request, route_id=None):
route_old_Dict = None
owner_type = None
tpl_form_by_owner_type = 'v2/forms/f_make_customer_route.html'
tpl_block_by_owner_type = 'v2/blocks/b_make_customer_route.html'
tpl_form_by_owner_type = 'v2/forms/f_create_customer_route.html'
tpl_block_by_owner_type = 'v2/blocks/b_create_customer_route.html'
try:
@@ -395,19 +395,19 @@ def create_or_change_route_ajax(request, route_id=None):
owner_type = data['owner_type']
if owner_type == 'mover':
tpl_form_by_owner_type = 'v2/forms/f_make_mover_order.html'
tpl_block_by_owner_type = 'v2/blocks/b_make_mover_order.html'
tpl_form_by_owner_type = 'v2/forms/f_create_mover_route.html'
tpl_block_by_owner_type = 'v2/blocks/b_create_mover_route.html'
route = None
if route_id:
route = Route.objects.get(id=route_id)
if route:
form = RouteForm(data, instance=route)
form = RouteForm(data=data, instance=route, owner_type=owner_type)
Dict.update({'route': route})
route_old_Dict = deepcopy(route.__dict__)
else:
form = RouteForm(data)
form = RouteForm(data=data, owner_type=owner_type)
if not form.is_valid():
form.initial = form.cleaned_data