From 187393341639ba8b547678a99fb12d0b47398003 Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 29 Aug 2023 11:47:09 +0300 Subject: [PATCH 1/2] 0.5.1 ArticlesApp --- ArticlesApp/views.py | 4 ++-- RoutesApp/js_views.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ArticlesApp/views.py b/ArticlesApp/views.py index dc7891f..783a5c3 100644 --- a/ArticlesApp/views.py +++ b/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 diff --git a/RoutesApp/js_views.py b/RoutesApp/js_views.py index b53d3c3..8b7b007 100644 --- a/RoutesApp/js_views.py +++ b/RoutesApp/js_views.py @@ -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() From e97dc7fcee1ece19997f08246da451bd81639c8a Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 29 Aug 2023 12:03:33 +0300 Subject: [PATCH 2/2] 0.5.2 find route limit by movers --- RoutesApp/js_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RoutesApp/js_views.py b/RoutesApp/js_views.py index 8b7b007..c6cd87e 100644 --- a/RoutesApp/js_views.py +++ b/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)