set filter and order in queryset for sous categorie proposition service

qfdmo/admin/acteur.py

@@ -93,13 +93,21 @@ def __init__(self, *args, **kwargs):
                 ).order_by("libelle_unaccent")
             )
 
-    filter_horizontal = [
-        "sous_categories",
-    ]
+
+class InlinePropositionServiceForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if "sous_categories" in self.fields:
+            self.fields["sous_categories"].queryset = (
+                SousCategorieObjet.objects.annotate(
+                    libelle_unaccent=Unaccent(Lower("libelle")),
+                    categorie_libelle_unaccent=Unaccent(Lower("categorie__libelle")),
+                ).order_by("categorie_libelle_unaccent", "libelle_unaccent")
+            )
 
 
 class BasePropositionServiceInline(admin.TabularInline):
-    form = BasePropositionServiceForm
+    form = InlinePropositionServiceForm
     extra = 0
 
     fields = (
@@ -108,6 +116,8 @@ class BasePropositionServiceInline(admin.TabularInline):
         "sous_categories",
     )
 
+    filter_vertical = ("sous_categories",)
+
 
 class PropositionServiceInline(BasePropositionServiceInline, NotEditableInlineMixin):
     model = PropositionService

qfdmo/models/categorie_objet.py

@@ -46,7 +46,7 @@ class Meta:
     )
 
     def __str__(self) -> str:
-        return self.libelle
+        return f"{self.categorie.libelle} | {self.libelle}"
 
     @cached_property
     def url_carte(self):