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

Merge remote-tracking branch 'origin/v2' into v2

Browse Source
This commit is contained in:
SBD
2025-02-28 15:17:05 +03:00
parent 60a088236b 768d82a026
commit 053d7f79da
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RoutesApp/funcs.py
View File

@@ -10,7 +10,7 @@ from datetime import datetime, timedelta
from django.db.models import F, Q from django.db.models import F, Q
import copy import copy
elements_on_page = 10 elements_on_page = 25
def get_cargo_types_by_type_transport(type_transport, form=None): def get_cargo_types_by_type_transport(type_transport, form=None):

4
RoutesApp/js_views.py
View File

@@ -408,6 +408,10 @@ def create_or_change_route_ajax(request, route_id=None):
tpl_form_by_owner_type = 'v2/forms/f_create_mover_route.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' tpl_block_by_owner_type = 'v2/blocks/b_create_mover_route.html'
if 'route_id' in data and data['route_id']:
route_id = data['route_id']
del data['route_id']
route = None route = None
if route_id: if route_id:
route = Route.objects.get(id=route_id) route = Route.objects.get(id=route_id)