diff --git a/static/js/dynamic_loading_routes.js b/static/js/dynamic_loading_routes.js index 420f5cb..90ec418 100644 --- a/static/js/dynamic_loading_routes.js +++ b/static/js/dynamic_loading_routes.js @@ -1,5 +1,5 @@ -let page_iterator = 2 -let separator_iterator = 1 +page_iterator = 2 +separator_iterator = 1 function load_routes (el) { let number_last_route = el.id @@ -118,7 +118,7 @@ function forloop_func_form (data,get,str) { } } if (!data["type_transport"]){ - data["type_transport"] = + data["type_transport"] = "=&" str = `${str}type_transport=&` } if (get !== null){ diff --git a/templates/forms/f_find_route_filters_form.html b/templates/forms/f_find_route_filters_form.html index eb2bfec..f0206a9 100644 --- a/templates/forms/f_find_route_filters_form.html +++ b/templates/forms/f_find_route_filters_form.html @@ -14,7 +14,7 @@ {# #} {# #} {# #} - {% for item in form.fields.type_transport.choices %} + {% for item in route_form.fields.type_transport.choices %} {% if forloop.counter0 > 0 %}
Откуда забрать посылку
- {% for item in form.fields.to_place.choices %} - + {% for item in route_form.fields.to_place.choices %} + {% endfor %}
- +
@@ -82,7 +82,7 @@
Сортировать по:
diff --git a/templates/forms/f_find_route_form_main_find_routes.html b/templates/forms/f_find_route_form_main_find_routes.html index 5f7b456..e83d793 100644 --- a/templates/forms/f_find_route_form_main_find_routes.html +++ b/templates/forms/f_find_route_form_main_find_routes.html @@ -16,7 +16,7 @@ class="el_form_find_route" hidden class="disp-none" - {% if form.initial.from_address_point %}value="{{ form.initial.from_address_point }}"{% endif %} + {% if route_form.initial.from_address_point %}value="{{ route_form.initial.from_address_point }}"{% endif %} />
@@ -55,7 +55,7 @@ class="el_form_find_route" hidden class="disp-none" - {% if form.initial.to_address_point %}value="{{ form.initial.to_address_point}}"{% endif %}/> + {% if route_form.initial.to_address_point %}value="{{ route_form.initial.to_address_point}}"{% endif %}/> + {% if route_form.initial.to_address_point_txt %}value="{{ route_form.initial.to_address_point_txt}}"{% endif %}/>
@@ -77,18 +77,18 @@
- +
- +
- - {% for item in form.fields.cargo_type.choices %} - + {% for item in route_form.fields.cargo_type.choices %} + {% endfor %}