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 16:07:58 +03:00
parent 134216c5f5 685c201840
commit fef72df927
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RoutesApp/forms.py
View File

@@ -58,7 +58,8 @@ class RouteForm(forms.ModelForm):
try: try:
if 'type_transport' in self.errors: if 'type_transport' in self.errors:
self.errors.pop('type_transport') if self.instance and self.instance.owner_type == 'customer':
self.errors.pop('type_transport')
if 'phone' in cleaned_data and 'phone' in cleaned_data: if 'phone' in cleaned_data and 'phone' in cleaned_data:
from BaseModels.validators.form_field_validators import get_phone_valid_error from BaseModels.validators.form_field_validators import get_phone_valid_error

2
RoutesApp/js_views.py
View File

@@ -410,7 +410,7 @@ def create_or_change_route_ajax(request, route_id=None):
if 'route_id' in data and data['route_id']: if 'route_id' in data and data['route_id']:
route_id = data['route_id'] route_id = data['route_id']
del data['route_id'] # del data['route_id']
route = None route = None
if route_id: if route_id: