diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py index 86e1b4b..ba014fd 100644 --- a/RoutesApp/funcs.py +++ b/RoutesApp/funcs.py @@ -1,16 +1,21 @@ from .models import * -def get_routes_for_user(user): +def get_routes_Dict(user=None): from ReferenceDataApp.models import Airport, Country, City - if not user and user.is_authenticated: - errors_Dict = { - 'errors': { - 'all__': f'ошибка идентификации пользователя' - } - } - return errors_Dict + # if not user and user.is_authenticated: + # errors_Dict = { + # 'errors': { + # 'all__': f'ошибка идентификации пользователя' + # } + # } + # return errors_Dict + kwargs = {} + if user: + kwargs.update({ + 'owner': user + }) - routes = Route.objects.filter(owner=user) + routes = Route.objects.filter(**kwargs).order_by('-modifiedDT') res_Dict = {} diff --git a/RoutesApp/js_views.py b/RoutesApp/js_views.py index b9ba100..bead357 100644 --- a/RoutesApp/js_views.py +++ b/RoutesApp/js_views.py @@ -14,7 +14,7 @@ from datetime import datetime from django.template.loader import render_to_string from django.urls import reverse from .forms import * -from .funcs import get_routes_for_user +from .funcs import get_routes_Dict def edit_route_ajax(request): @@ -153,7 +153,7 @@ def get_routes_ajax(request): raise Http404 try: - routes_Dict = get_routes_for_user(request.user) + routes_Dict = get_routes_Dict(request.user) if 'errors' in routes_Dict: return JsonResponse(routes_Dict, status=400) @@ -209,7 +209,7 @@ def create_or_change_route_ajax(request, route_id=None): obj.owner = request.user obj.save() - routes_Dict = get_routes_for_user(request.user) + routes_Dict = get_routes_Dict(request.user) if 'errors' in routes_Dict: form.errors.update(routes_Dict['errors']) diff --git a/RoutesApp/views.py b/RoutesApp/views.py index cd2720f..df370b7 100644 --- a/RoutesApp/views.py +++ b/RoutesApp/views.py @@ -9,13 +9,17 @@ from django.contrib.auth.decorators import login_required from BaseModels.mailSender import techSendMail from django.utils.translation import gettext as _ from datetime import datetime +from .funcs import * def route_search_results_View(request): - routes = Route.objects.filter(enable=True).order_by('-modifiedDT') - Dict = { - 'routes': routes - } + Dict = {} + + routes = get_routes_Dict() + if routes: + Dict = { + 'routes': routes['routes'] + } t = loader.get_template('pages/p_results_find_route.html') return HttpResponse(t.render(Dict, request))