From 3f4ecef343841df95d8d11c79c2adc69bfd839e0 Mon Sep 17 00:00:00 2001 From: kdeterme Date: Fri, 21 Aug 2026 10:34:43 +0200 Subject: [PATCH] refactor: consolidate django import statements and simplify Q object references in structures.py --- loko/assets/views/structures.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/loko/assets/views/structures.py b/loko/assets/views/structures.py index ee02cef..0d914e3 100644 --- a/loko/assets/views/structures.py +++ b/loko/assets/views/structures.py @@ -8,10 +8,9 @@ from django.views.decorators.http import require_GET, require_POST from django.contrib.gis.db.models.functions import Transform, Distance from django.contrib.gis.geos import GEOSGeometry, Point from django.contrib.contenttypes.models import ContentType -from django.db.models import Q, Case, When, IntegerField, CharField +from django.db.models import Q, Case, When, IntegerField, CharField, Func, Prefetch from django.db.models.functions import Lower -from django.db.models import Func, Prefetch -from django.db import connection +from django.db import models, connection from django.template.loader import render_to_string from django.utils.translation import get_language, gettext as _ @@ -650,13 +649,13 @@ def structures_locations_detail(request, location_id): if document_folder: all_descendants = DocumentManagementService.get_folder_and_descendants(document_folder) te_folder = DocumentFolder.objects.filter( - models.Q(pk__in=all_descendants) + Q(pk__in=all_descendants) & ( - models.Q(slug__icontains="exceptional-transport") - | models.Q(slug__icontains="transport-exceptionnel") - | models.Q(slug__icontains="transports-exceptionnels") - | models.Q(name__icontains="Exceptional transport") - | models.Q(name__icontains="Transport exceptionnel") + Q(slug__icontains="exceptional-transport") + | Q(slug__icontains="transport-exceptionnel") + | Q(slug__icontains="transports-exceptionnels") + | Q(name__icontains="Exceptional transport") + | Q(name__icontains="Transport exceptionnel") ) ).first() if te_folder: