Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-08-29 12:27:28 +03:00
2 changed files with 6 additions and 4 deletions

View File

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

View File

@@ -154,8 +154,8 @@ def find_routes_ajax(request):
try: try:
data = request.POST data = request.POST.dict()
data['owner_type'] = 'mover'
routes_Dict = get_routes_Dict(data=data) routes_Dict = get_routes_Dict(data=data)
if 'errors' in routes_Dict: if 'errors' in routes_Dict:
return JsonResponse(routes_Dict, status=400) 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) return JsonResponse({'html': html}, status=400)
obj = form.save(commit=False) obj = form.save(commit=False)
if 'owner_type' in data:
obj.owner_type = data['owner_type']
obj.owner = request.user obj.owner = request.user
obj.save() obj.save()