0.12.32 fix switch langs

GeneralApp/templatetags/base_tags_extra.py

@@ -78,7 +78,7 @@ def del_amp_symbols(value):
 @stringfilter
 def del_lang_from_path(value):
     path_list = value.split('/')
-    path = '/' + '/'.join(path_list[2:])
+    path = '/' + '/'.join(path_list[4:])
 
     # for i in path_list[1:]:
     #     path.join(i + '/')

RoutesApp/views.py

@@ -19,42 +19,46 @@ from GeneralApp.funcs import get_inter_http_respose
 def route_search_results_View(request):
 
     Dict = {}
-    data = None
+    data = {}
 
-    if request.GET:
-        data = request.GET.dict()
+    try:
 
-    routes_Dict = get_routes_Dict(data=data)
-    if routes_Dict:
-        Dict = {
-            'routes': routes_Dict['routes'],
-            'last_block': routes_Dict['last_block'],
-            'show_filter_and_results': True,
-            'owner_type': data['owner_type'],
-            'last_el': routes_Dict['last_el'],
-            'page_type': 'routes',
-            'next_page_els_count': routes_Dict['next_page_els_count'],
-        }
-    if 'from_address_point_txt' in routes_Dict:
-        data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']})
-    if 'to_address_point_txt' in routes_Dict:
-        data.update({'to_address_point_txt': routes_Dict['to_address_point_txt']})
-    Dict.update({'route_form': RouteForm(initial=data)})
+        if request.GET:
+            data = request.GET.dict()
 
-    title = _('Результат поиска маршрутов')
-    if 'from_address_point_txt' in data:
-        title = f'{title} из {data["from_address_point_txt"]}'
-    if 'to_address_point_txt' in data:
-        title = f'{title} в {data["to_address_point_txt"]}'
+        routes_Dict = get_routes_Dict(data=data)
+        if routes_Dict:
+            Dict = {
+                'routes': routes_Dict['routes'],
+                'last_block': routes_Dict['last_block'],
+                'show_filter_and_results': True,
+                'owner_type': data['owner_type'],
+                'last_el': routes_Dict['last_el'],
+                'page_type': 'routes',
+                'next_page_els_count': routes_Dict['next_page_els_count'],
+            }
+        if 'from_address_point_txt' in routes_Dict:
+            data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']})
+        if 'to_address_point_txt' in routes_Dict:
+            data.update({'to_address_point_txt': routes_Dict['to_address_point_txt']})
+        Dict.update({'route_form': RouteForm(initial=data)})
 
-    Dict.update({
-        'page': {
-            'title': title,
-            'description': title,
-            'keywords': title,
-        }
-    })
+        title = _('Результат поиска маршрутов')
+        if 'from_address_point_txt' in data:
+            title = f'{title} из {data["from_address_point_txt"]}'
+        if 'to_address_point_txt' in data:
+            title = f'{title} в {data["to_address_point_txt"]}'
 
-    t = loader.get_template('pages/p_results_find_route.html')
-    return get_inter_http_respose(t, Dict, request)
+        Dict.update({
+            'page': {
+                'title': title,
+                'description': title,
+                'keywords': title,
+            }
+        })
+
+        t = loader.get_template('pages/p_results_find_route.html')
+        return get_inter_http_respose(t, Dict, request)
     # return HttpResponse(t.render(Dict, request))
+    except Exception as e:
+        raise Http404

templates/blocks/b_header.html

@@ -49,8 +49,8 @@
               <div onclick="showLang(this)" class="dropdown_lang">
                   <div id="dropbtn_lang" class="dropbtn_lang">RU</div>
                   <div class="dropdown-content-lang">
-                    <a id="ru_lang" href="/ru{{ request.path|del_lang_from_path }}">RU</a>
-                    <a id="en_lang" href="/en{{ request.path|del_lang_from_path }}">EN</a>
+                    <a id="ru_lang" href="/ru{{ request.build_absolute_uri|del_lang_from_path }}">RU</a>
+                    <a id="en_lang" href="/en{{ request.build_absolute_uri|del_lang_from_path }}">EN</a>
                   </div>
               </div>
           </div>