Merge remote-tracking branch 'origin/main'

ArticlesApp/views.py

@@ -126,8 +126,8 @@ def ArticlesOnePageView(request, art_url):
     }
 
     try:
-        art = UserPageModel.objects.get(**kwargs)
-    except UserPageModel.DoesNotExist:
+        art = ArticleModel.objects.get(**kwargs)
+    except ArticleModel.DoesNotExist:
         raise Http404
 
 

RoutesApp/js_views.py

@@ -154,8 +154,8 @@ def find_routes_ajax(request):
 
     try:
 
-        data = request.POST
-
+        data = request.POST.dict()
+        data['owner_type'] = 'mover'
         routes_Dict = get_routes_Dict(data=data)
         if 'errors' in routes_Dict:
             return JsonResponse(routes_Dict, status=400)
@@ -242,6 +242,8 @@ def create_or_change_route_ajax(request, route_id=None):
             return JsonResponse({'html': html}, status=400)
 
         obj = form.save(commit=False)
+        if 'owner_type' in data:
+            obj.owner_type = data['owner_type']
         obj.owner = request.user
         obj.save()