Merge remote-tracking branch 'origin/v2' into v2
This commit is contained in:
@@ -58,6 +58,7 @@ class RouteForm(forms.ModelForm):
|
|||||||
try:
|
try:
|
||||||
|
|
||||||
if 'type_transport' in self.errors:
|
if 'type_transport' in self.errors:
|
||||||
|
if self.instance and self.instance.owner_type == 'customer':
|
||||||
self.errors.pop('type_transport')
|
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:
|
||||||
|
|||||||
@@ -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:
|
||||||
|
|||||||
Reference in New Issue
Block a user