2.1.22 routes funcs

RoutesApp/funcs.py

@@ -3,7 +3,7 @@ from django.http import JsonResponse
 from BaseModels.mailSender import techSendMail
 from GeneralApp.funcs_options import get_mail_send_options
 from .models import *
-from .forms import *
+# from .forms import *
 from django.utils.translation import gettext as _
 from django.template.loader import render_to_string
 from datetime import datetime, timedelta
@@ -30,6 +30,7 @@ def get_cargo_types_by_type_transport(type_transport, form=None):
 
 
 def get_profile_new_route_page_html(request, data):
+    from .forms import RouteForm
 
     if not 'owner_type' in data:
         msg = 'не достаточно данных'
@@ -45,13 +46,14 @@ def get_profile_new_route_page_html(request, data):
         tpl = 'v2/blocks/b_create_customer_route.html'
         # form.fields['type_transport'].choices = type_transport_choices
 
-    from .forms import RouteForm
-    form = RouteForm(owner_type=owner_type)
-    form.initial['owner_type'] = owner_type
 
-    Dict = {
+    # form = RouteForm(owner_type=owner_type)
-        'form': form
+    # form.initial['owner_type'] = owner_type
-    }
+    #
+    # Dict = {
+    #     'form': form
+    # }
+    Dict = {}
 
     try:
 
@@ -67,6 +69,12 @@ def get_profile_new_route_page_html(request, data):
 
         Dict.update({'owner_type': owner_type})
 
+        if not 'cargo_type' in form.initial or not form.initial['cargo_type']:
+            if form.instance:
+                form.initial['cargo_type'] = form.instance.cargo_type
+            else:
+                form.initial['cargo_type'] = form.fields['cargo_type'].initial
+
 
         if request.user and request.user.is_authenticated and request.user.user_profile and request.user.user_profile.phone:
             form.initial.update({'phone': request.user.user_profile.phone})