@@ -385,6 +680,191 @@
{% include "assets/components/add_asset_modal.html" with modal_id="addAssetLocationModal" thematic_code="structures" location=location categories=categories suggested_code=suggested_code %}
{% endif %}
+
+{% if can_edit_exceptional_transport and location.structure %}
+
+{% endif %}
+
{% endblock content%}
@@ -398,6 +878,43 @@
const feature_geom = JSON.parse(document.getElementById("geom_value").textContent);
const feature_lon = JSON.parse(document.getElementById("lon_value").textContent);
const feature_lat = JSON.parse(document.getElementById("lat_value").textContent);
+
+ {% if can_edit_exceptional_transport %}
+ const teForm = document.getElementById('exceptionalTransportForm');
+ if (teForm) {
+ teForm.addEventListener('submit', function(e) {
+ e.preventDefault();
+ const submitBtn = document.getElementById('saveTeBtn');
+ const spinner = document.getElementById('saveTeSpinner');
+ if (submitBtn) submitBtn.disabled = true;
+ if (spinner) spinner.classList.remove('d-none');
+
+ const formData = new FormData(teForm);
+ fetch(teForm.action, {
+ method: 'POST',
+ body: formData,
+ headers: {
+ 'X-Requested-With': 'XMLHttpRequest'
+ }
+ })
+ .then(res => res.json())
+ .then(data => {
+ if (data.success) {
+ window.location.reload();
+ } else {
+ alert(data.error || JSON.stringify(data.errors));
+ if (submitBtn) submitBtn.disabled = false;
+ if (spinner) spinner.classList.add('d-none');
+ }
+ })
+ .catch(err => {
+ alert("{% translate 'Une erreur est survenue lors de l\'enregistrement.' %}");
+ if (submitBtn) submitBtn.disabled = false;
+ if (spinner) spinner.classList.add('d-none');
+ });
+ });
+ }
+ {% endif %}
@@ -406,3 +923,4 @@
{% endif %}
{% endblock script %}
+
diff --git a/loko/assets/tests_exceptional_transport.py b/loko/assets/tests_exceptional_transport.py
new file mode 100644
index 0000000..7028f2f
--- /dev/null
+++ b/loko/assets/tests_exceptional_transport.py
@@ -0,0 +1,256 @@
+from django.test import TestCase, Client
+from django.contrib.auth import get_user_model
+from django.contrib.gis.geos import Point
+from django.urls import reverse
+
+from common.models import Thematic, Role, UserConfig, UserThematics
+from assets.models.structures import (
+ Structure, StructureLocation, StructureExceptionalTransport, StructureExceptionalTransportNotice
+)
+from assets.permissions import can_view_exceptional_transport, can_edit_exceptional_transport
+from documents.models import DocumentFolder, ManagedDocument, DocumentVersion
+from documents.permissions import filter_documents_for_user, filter_folders_for_user
+
+User = get_user_model()
+
+
+class ExceptionalTransportTests(TestCase):
+ def setUp(self):
+ self.thematic_structures, _ = Thematic.objects.get_or_create(
+ code="structures",
+ defaults={"name_fr": "Ouvrages d'art", "name_nl": "Kunstwerken"}
+ )
+ self.thematic_documents, _ = Thematic.objects.get_or_create(
+ code="documents",
+ defaults={"name_fr": "Documents", "name_nl": "Documenten"}
+ )
+
+ self.role_admin, _ = Role.objects.get_or_create(name="admin")
+ self.role_top_manager, _ = Role.objects.get_or_create(name="top_manager")
+ self.role_agent, _ = Role.objects.get_or_create(name="agent")
+
+ # Users
+ self.superuser = User.objects.create_superuser(
+ username="admin_te",
+ email="admin_te@example.com",
+ password="password123"
+ )
+ UserConfig.objects.get_or_create(user=self.superuser, defaults={"is_intern": True})
+
+ self.user_no_te = User.objects.create_user(
+ username="user_no_te",
+ email="user_no_te@example.com",
+ password="password123"
+ )
+ cfg_no_te, _ = UserConfig.objects.get_or_create(user=self.user_no_te, defaults={"is_intern": True, "limit_assets_to_contracts": False})
+ cfg_no_te.roles.add(self.role_agent)
+ UserThematics.objects.update_or_create(user_config=cfg_no_te, thematic=self.thematic_structures, defaults={"can_view_assets": True})
+ UserThematics.objects.update_or_create(user_config=cfg_no_te, thematic=self.thematic_documents, defaults={"can_view_assets": True})
+
+ self.user_te_viewer = User.objects.create_user(
+ username="user_te_viewer",
+ email="user_te_viewer@example.com",
+ password="password123"
+ )
+ cfg_viewer, _ = UserConfig.objects.get_or_create(
+ user=self.user_te_viewer,
+ defaults={
+ "is_intern": True,
+ "limit_assets_to_contracts": False,
+ "has_exceptional_transport_profile": True,
+ "exceptional_transport_can_edit": False
+ }
+ )
+ cfg_viewer.roles.add(self.role_agent)
+ UserThematics.objects.update_or_create(user_config=cfg_viewer, thematic=self.thematic_structures, defaults={"can_view_assets": True})
+ UserThematics.objects.update_or_create(user_config=cfg_viewer, thematic=self.thematic_documents, defaults={"can_view_assets": True})
+
+ self.user_te_editor = User.objects.create_user(
+ username="user_te_editor",
+ email="user_te_editor@example.com",
+ password="password123"
+ )
+ cfg_editor, _ = UserConfig.objects.get_or_create(
+ user=self.user_te_editor,
+ defaults={
+ "is_intern": True,
+ "limit_assets_to_contracts": False,
+ "has_exceptional_transport_profile": True,
+ "exceptional_transport_can_edit": True
+ }
+ )
+ cfg_editor.roles.add(self.role_agent)
+ UserThematics.objects.update_or_create(user_config=cfg_editor, thematic=self.thematic_structures, defaults={"can_view_assets": True})
+ UserThematics.objects.update_or_create(user_config=cfg_editor, thematic=self.thematic_documents, defaults={"can_view_assets": True})
+
+ # Structure & Location
+ self.structure = Structure.objects.create(
+ code="OA-TEST-001",
+ name_fr="Pont Test TE",
+ name_nl="Brug Test TE"
+ )
+ self.location = StructureLocation.objects.create(
+ structure=self.structure,
+ code="LOC-OA-001",
+ name_fr="Emplacement Principal",
+ is_main_location=True
+ )
+ self.structure.main_location = self.location
+ self.structure.save()
+
+ # TE Info
+ self.te_info = StructureExceptionalTransport.objects.create(
+ structure=self.structure,
+ fod_vnr=1234,
+ national_id="IDN-5678",
+ bridge_class="T180152402024030",
+ passage_status="conditional",
+ max_authorized_weight_tonnes=180.0,
+ max_calculated_weight_tonnes=240.0,
+ min_guaranteed_capacity_tonnes=150.0,
+ max_axle_load_tonnes=20.0,
+ min_axle_spacing_m=1.5,
+ clearance_height_left_m=4.20,
+ clearance_height_center_m=4.50,
+ clearance_height_right_m=4.20,
+ usable_width_m=7.50,
+ max_speed_kmh=5,
+ is_braking_forbidden=True,
+ is_isolated_crossing_only=True,
+ safety_distance_m=5.0,
+ traffic_interruption_required=False,
+ lane_positioning="center",
+ prescriptions_fr="Vitesse ≤ 5 km/h, sans freinage.",
+ prescriptions_nl="Snelheid ≤ 5 km/u, niet remmen."
+ )
+
+ # Notice
+ self.notice = StructureExceptionalTransportNotice.objects.create(
+ structure=self.structure,
+ mission_reference="Mission 64",
+ result="conditional",
+ evaluated_total_weight_tonnes=200.0,
+ evaluated_axle_load_tonnes=20.0,
+ comments="Passage autorisé sous réserve d'escorte."
+ )
+
+ def test_permission_helpers(self):
+ # Superuser
+ self.assertTrue(can_view_exceptional_transport(self.superuser))
+ self.assertTrue(can_edit_exceptional_transport(self.superuser))
+
+ # Standard User without TE profile
+ self.assertFalse(can_view_exceptional_transport(self.user_no_te))
+ self.assertFalse(can_edit_exceptional_transport(self.user_no_te))
+
+ # User with TE viewer profile
+ self.assertTrue(can_view_exceptional_transport(self.user_te_viewer))
+ self.assertFalse(can_edit_exceptional_transport(self.user_te_viewer))
+
+ # User with TE editor profile
+ self.assertTrue(can_view_exceptional_transport(self.user_te_editor))
+ self.assertTrue(can_edit_exceptional_transport(self.user_te_editor))
+
+ def test_models_str_and_properties(self):
+ self.assertIn("OA-TEST-001", str(self.te_info))
+ self.assertIn("Mission 64", str(self.notice))
+
+ def test_detail_view_visibility_for_unauthorized_user(self):
+ self.client.force_login(self.user_no_te)
+ url = reverse("assets:structures_locations_detail", kwargs={"location_id": self.location.id})
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, 200)
+ content = response.content.decode("utf-8")
+ # Ne doit pas afficher la section TE ni les prescriptions secrètes
+ self.assertNotIn("Transport exceptionnel & Convois lourds", content)
+ self.assertNotIn("Transport exceptionnel & Convois lourds", content)
+ self.assertNotIn("T180152402024030", content)
+
+ def test_detail_view_visibility_for_te_viewer(self):
+ self.client.force_login(self.user_te_viewer)
+ url = reverse("assets:structures_locations_detail", kwargs={"location_id": self.location.id})
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, 200)
+ content = response.content.decode("utf-8")
+ # Doit afficher les infos TE
+ self.assertIn("Transport exceptionnel", content)
+ self.assertIn("T180152402024030", content)
+ self.assertIn("1234", content)
+ # Mais ne doit PAS afficher le bouton de modification
+ self.assertNotIn('data-bs-target="#editExceptionalTransportModal"', content)
+
+ def test_detail_view_visibility_for_te_editor(self):
+ self.client.force_login(self.user_te_editor)
+ url = reverse("assets:structures_locations_detail", kwargs={"location_id": self.location.id})
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, 200)
+ content = response.content.decode("utf-8")
+ # Doit afficher les infos TE et le modal de modification
+ self.assertIn("Transport exceptionnel", content)
+ self.assertIn('data-bs-target="#editExceptionalTransportModal"', content)
+ self.assertIn('id="exceptionalTransportForm"', content)
+
+ def test_edit_exceptional_transport_endpoint_permissions(self):
+ url = reverse("assets:structures_edit_exceptional_transport", kwargs={"structure_id": self.structure.id})
+ post_data = {
+ "passage_status": "authorized",
+ "max_authorized_weight_tonnes": 220.0,
+ "max_speed_kmh": 10,
+ "bridge_class": "T200",
+ }
+
+ # Non authentifié -> 302/401/403
+ self.client.logout()
+ res_anon = self.client.post(url, data=post_data)
+ self.assertIn(res_anon.status_code, (302, 401, 403))
+
+ # Viewer sans droit d'édition -> 403
+ self.client.force_login(self.user_te_viewer)
+ res_viewer = self.client.post(url, data=post_data)
+ self.assertEqual(res_viewer.status_code, 403)
+
+ # Editor avec droit d'édition -> 200
+ self.client.force_login(self.user_te_editor)
+ res_editor = self.client.post(url, data=post_data)
+ self.assertEqual(res_editor.status_code, 200)
+ json_data = res_editor.json()
+ self.assertTrue(json_data["success"])
+
+ # Vérification en BDD
+ self.te_info.refresh_from_db()
+ self.assertEqual(self.te_info.passage_status, "authorized")
+ self.assertEqual(float(self.te_info.max_authorized_weight_tonnes), 220.0)
+ self.assertEqual(self.te_info.max_speed_kmh, 10)
+ self.assertEqual(self.te_info.bridge_class, "T200")
+ self.assertEqual(self.te_info.updated_by, self.user_te_editor)
+
+ def test_document_filtering_security(self):
+ # Création d'un dossier TE et d'un document
+ te_folder = DocumentFolder.objects.create(
+ name="Civil engineering / Exceptional transport",
+ slug="oa-test-001-exceptional-transport"
+ )
+ te_folder.thematics.add(self.thematic_documents)
+
+ doc = ManagedDocument.objects.create(
+ title="Note de calcul convoi 240t",
+ created_by=self.superuser
+ )
+ doc.folders.add(te_folder)
+
+ user_no_te = User.objects.get(pk=self.user_no_te.pk)
+ user_te_viewer = User.objects.get(pk=self.user_te_viewer.pk)
+
+ # Filtrage pour l'utilisateur sans TE
+ docs_no_te = filter_documents_for_user(ManagedDocument.objects.all(), user_no_te)
+ self.assertNotIn(doc, docs_no_te)
+
+ folders_no_te = filter_folders_for_user(DocumentFolder.objects.all(), user_no_te)
+ self.assertNotIn(te_folder, folders_no_te)
+
+ # Filtrage pour l'utilisateur avec profil TE
+ docs_te = filter_documents_for_user(ManagedDocument.objects.all(), user_te_viewer)
+ self.assertIn(doc, docs_te)
+
+ folders_te = filter_folders_for_user(DocumentFolder.objects.all(), user_te_viewer)
+ self.assertIn(te_folder, folders_te)
diff --git a/loko/assets/urls.py b/loko/assets/urls.py
index f57d12a..2ca4e2a 100644
--- a/loko/assets/urls.py
+++ b/loko/assets/urls.py
@@ -161,7 +161,7 @@ urlpatterns = [
path('structures/locations/
/', structures.structures_locations_detail, name='structures_locations_detail'),
path('structures/assets/', structures.structures_assets, name='structures_assets'),
path('structures/assets/geojson/', structures.structures_assets_geojson, name='structures_assets_geojson'),
- path('structures/assets/autocomplete/', structures.structures_assets_autocomplete, name='structures_autocomplete_assets'),
+ path('structures/structures//edit-exceptional-transport/', structures.structures_edit_exceptional_transport, name='structures_edit_exceptional_transport'),
path('structures///', structures.structures_assets_detail, name='structures_assets_detail'),
path('controlcenters/', controlcenters.controlcenters_index, name='controlcenters_index'),
diff --git a/loko/assets/views/structures.py b/loko/assets/views/structures.py
index de6be35..ee02cef 100644
--- a/loko/assets/views/structures.py
+++ b/loko/assets/views/structures.py
@@ -23,14 +23,17 @@ from collections import defaultdict
from common.utils import check_thematic_access
from common.models import Thematic, UserConfig, UserContractAccess, UserThematics
-from assets.models import Structure, StructureLocation, StructureGeoAsset, StructureAssetModel, StructureDocument, StructureContract, AssetCategory
+from assets.models import (
+ Structure, StructureLocation, StructureGeoAsset, StructureAssetModel, StructureDocument, StructureContract, AssetCategory,
+ StructureExceptionalTransport, StructureExceptionalTransportNotice
+)
+from assets.permissions import can_view_exceptional_transport, can_edit_exceptional_transport
+from assets.forms import StructureDocumentForm, StructureExceptionalTransportForm
from interventions.models import InterventionLocation
from interventions.views.drafts import InterventionDraftManager
-from assets.forms import StructureDocumentForm
-
-from documents.models import DocumentTag, DocumentFolder
+from documents.models import DocumentTag, DocumentFolder, ManagedDocument
from documents.services import DocumentManagementService
@check_thematic_access('structures')
@@ -614,7 +617,7 @@ def structures_locations_detail(request, location_id):
# 7) Géométrie 4326 (main_location fallback)
if location.geom:
location_geom_4326 = location.geom.transform(4326, clone=True)
- elif location.structure and location.structure.main_location:
+ elif location.structure and location.structure.main_location and location.structure.main_location.geom:
location_geom_4326 = location.structure.main_location.geom.transform(4326, clone=True)
else:
location_geom_4326 = None
@@ -628,6 +631,43 @@ def structures_locations_detail(request, location_id):
from assets.utils.asset_code_generator import get_suggested_asset_code
suggested_code = get_suggested_asset_code('structures', location=location)
+ # --- GESTION DU TRANSPORT EXCEPTIONNEL ---
+ can_view_te = can_view_exceptional_transport(user)
+ can_edit_te = can_edit_exceptional_transport(user)
+ te_info = None
+ te_documents = []
+ te_notices = []
+ te_form = None
+ te_folder = None
+
+ if can_view_te and location.structure:
+ te_info = getattr(location.structure, 'exceptional_transport_info', None)
+ te_notices = list(location.structure.exceptional_transport_notices.all())
+ if can_edit_te:
+ te_form = StructureExceptionalTransportForm(instance=te_info)
+
+ # Récupérer le dossier "Exceptional transport" et ses documents
+ if document_folder:
+ all_descendants = DocumentManagementService.get_folder_and_descendants(document_folder)
+ te_folder = DocumentFolder.objects.filter(
+ models.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")
+ )
+ ).first()
+ if te_folder:
+ te_folder_ids = DocumentManagementService.get_folder_and_descendants(te_folder)
+ te_documents = list(
+ ManagedDocument.objects.filter(
+ folders__pk__in=te_folder_ids,
+ is_archived=False
+ ).select_related('current_version', 'created_by').prefetch_related('tags').order_by('-updated_at')
+ )
+
return render(request, "assets/structures_location_detail.html", {
"location": location,
"interventions": interventions, # toutes les interventions de l'arbre
@@ -648,9 +688,40 @@ def structures_locations_detail(request, location_id):
"available_folders": available_folders,
"document_folder": document_folder,
"use_managed_documents": use_managed_documents if 'use_managed_documents' in dir() else False,
+ "can_view_exceptional_transport": can_view_te,
+ "can_edit_exceptional_transport": can_edit_te,
+ "te_info": te_info,
+ "te_documents": te_documents,
+ "te_notices": te_notices,
+ "te_form": te_form,
+ "te_folder": te_folder,
})
+@require_POST
+def structures_edit_exceptional_transport(request, structure_id):
+ if not request.user.is_authenticated:
+ return JsonResponse({'success': False, 'error': _("Authentification requise.")}, status=401)
+ if not can_edit_exceptional_transport(request.user):
+ return JsonResponse({'success': False, 'error': _("Permission refusée.")}, status=403)
+
+ structure = get_object_or_404(Structure, pk=structure_id)
+ te_info, _created = StructureExceptionalTransport.objects.get_or_create(structure=structure)
+
+ form = StructureExceptionalTransportForm(request.POST, instance=te_info)
+ if form.is_valid():
+ instance = form.save(commit=False)
+ instance.updated_by = request.user
+ instance.save()
+ return JsonResponse({
+ 'success': True,
+ 'message': _("Paramètres de transport exceptionnel enregistrés avec succès.")
+ })
+ else:
+ return JsonResponse({'success': False, 'errors': form.errors}, status=400)
+
+
+
@check_thematic_access('structures')
def structures_assets_detail(request, asset_model, asset_id):
diff --git a/loko/common/admin.py b/loko/common/admin.py
index 5b6553c..1844747 100644
--- a/loko/common/admin.py
+++ b/loko/common/admin.py
@@ -631,6 +631,10 @@ class UserConfigAdmin(admin.ModelAdmin):
'fields': ('panoramax_can_upload',),
'description': "Permissions spécifiques pour l'application Photos 360 / Panoramax."
}),
+ ('Ouvrages : Transports exceptionnels', {
+ 'fields': ('has_exceptional_transport_profile', 'exceptional_transport_can_edit'),
+ 'description': "Permissions pour l'accès aux données et documents de transport exceptionnel sur les ouvrages d'art."
+ }),
('Limitations', {
'fields': ('limit_assets_to_contracts', 'limit_interventions_to_contracts', 'limit_shortcuts_to_contracts', 'hide_intervention_map_by_default')
}),
diff --git a/loko/common/migrations/0013_userconfig_exceptional_transport_can_edit_and_more.py b/loko/common/migrations/0013_userconfig_exceptional_transport_can_edit_and_more.py
new file mode 100644
index 0000000..85b44b7
--- /dev/null
+++ b/loko/common/migrations/0013_userconfig_exceptional_transport_can_edit_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 6.0.7 on 2026-08-21 08:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('common', '0012_userconfig_control_list_filters_and_more'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='userconfig',
+ name='exceptional_transport_can_edit',
+ field=models.BooleanField(default=False, help_text='Autorise la modification des caractéristiques, gabarits et prescriptions de transport exceptionnel.', verbose_name='Peut modifier les données de transport exceptionnel'),
+ ),
+ migrations.AddField(
+ model_name='userconfig',
+ name='has_exceptional_transport_profile',
+ field=models.BooleanField(default=False, help_text="Donne accès aux données et documents de transport exceptionnel sur les ouvrages d'art.", verbose_name='Activer le profil Transport exceptionnel'),
+ ),
+ ]
diff --git a/loko/common/models.py b/loko/common/models.py
index 98ec490..e7c9656 100644
--- a/loko/common/models.py
+++ b/loko/common/models.py
@@ -304,6 +304,17 @@ class UserConfig(models.Model):
verbose_name="eSign : Gestionnaires",
help_text="Les gestionnaires (communes, Bruxelles Mobilité) pour lesquels l'utilisateur a des permissions."
)
+ # Permissions pour le transport exceptionnel (ouvrages d'art)
+ has_exceptional_transport_profile = models.BooleanField(
+ default=False,
+ verbose_name="Activer le profil Transport exceptionnel",
+ help_text="Donne accès aux données et documents de transport exceptionnel sur les ouvrages d'art."
+ )
+ exceptional_transport_can_edit = models.BooleanField(
+ default=False,
+ verbose_name="Peut modifier les données de transport exceptionnel",
+ help_text="Autorise la modification des caractéristiques, gabarits et prescriptions de transport exceptionnel."
+ )
# Catégories d'assets concernées pour l'approbation des interventions
approval_categories = models.ManyToManyField(
'assets.AssetCategory',
diff --git a/loko/documents/permissions.py b/loko/documents/permissions.py
index 3918975..1664ba0 100644
--- a/loko/documents/permissions.py
+++ b/loko/documents/permissions.py
@@ -76,7 +76,34 @@ def filter_documents_for_user(
if accessible_ct_ids:
filter_q |= models.Q(attachments__content_type_id__in=accessible_ct_ids)
- return queryset.filter(filter_q).distinct()
+ result_qs = queryset.filter(filter_q).distinct()
+
+ from assets.permissions import can_view_exceptional_transport
+ if not can_view_exceptional_transport(user):
+ result_qs = result_qs.exclude(
+ models.Q(tags__slug__in=['exceptional_transport', 'exceptional-transport', 'transports-exceptionnels'])
+ | models.Q(folders__slug__icontains='exceptional-transport')
+ | models.Q(folders__slug__icontains='transport-exceptionnel')
+ | models.Q(folders__slug__icontains='transports-exceptionnels')
+ | models.Q(folders__name__icontains='Exceptional transport')
+ | models.Q(folders__name__icontains='Transport exceptionnel')
+ )
+
+ return result_qs
+
+
+def _is_exceptional_transport_folder(folder: DocumentFolder) -> bool:
+ if not folder:
+ return False
+ name = (folder.name or "").lower()
+ slug = (folder.slug or "").lower()
+ return (
+ "exceptional transport" in name
+ or "transport exceptionnel" in name
+ or "exceptional-transport" in slug
+ or "transport-exceptionnel" in slug
+ or "transports-exceptionnels" in slug
+ )
def user_has_document_permission(
@@ -93,6 +120,20 @@ def user_has_document_permission(
if getattr(user, "is_superuser", False):
return True
+ from assets.permissions import can_view_exceptional_transport
+ if not can_view_exceptional_transport(user):
+ if (
+ document.tags.filter(slug__in=['exceptional_transport', 'exceptional-transport', 'transports-exceptionnels']).exists()
+ or document.folders.filter(
+ 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')
+ ).exists()
+ ):
+ return False
+
if document.created_by_id and document.created_by_id == getattr(user, "pk", None):
return True
@@ -703,7 +744,19 @@ def filter_folders_for_user(
if not visible_ids:
return queryset.none()
- return queryset.filter(pk__in=visible_ids).distinct()
+ result_qs = queryset.filter(pk__in=visible_ids).distinct()
+
+ from assets.permissions import can_view_exceptional_transport
+ if not can_view_exceptional_transport(user):
+ result_qs = result_qs.exclude(
+ 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')
+ )
+
+ return result_qs
def user_can_browse_folder(user, folder: DocumentFolder) -> bool:
@@ -725,6 +778,10 @@ def user_can_browse_folder(user, folder: DocumentFolder) -> bool:
"""
if user is None or not getattr(user, "is_authenticated", False):
return False
+
+ from assets.permissions import can_view_exceptional_transport
+ if not can_view_exceptional_transport(user) and _is_exceptional_transport_folder(folder):
+ return False
config = getattr(user, "config", None)
if not config: