diff --git a/mesads/app/admin/ads_manager_administrator.py b/mesads/app/admin/ads_manager_administrator.py index 32a9264..28b0f6b 100644 --- a/mesads/app/admin/ads_manager_administrator.py +++ b/mesads/app/admin/ads_manager_administrator.py @@ -80,5 +80,5 @@ def ads_managers_link(self, obj): reverse("admin:app_adsmanager_changelist") + "?administrator=" + str(obj.id) ) return mark_safe( - f'Voir les {obj.adsmanager_set.count()} gestionnaires ADS' + f'Voir les {obj.ordered_adsmanager_set().count()} gestionnaires ADS' ) diff --git a/mesads/app/models.py b/mesads/app/models.py index adc01b7..5892923 100644 --- a/mesads/app/models.py +++ b/mesads/app/models.py @@ -289,9 +289,11 @@ def __str__(self): def ordered_adsmanager_set(self): """Function helper to get the adsmanager set order by the administration name.""" - return self.adsmanager_set.prefetch_related( - "content_object", "ads_set" - ).order_by("commune__libelle", "epci__name", "prefecture__libelle") + return ( + self.adsmanager_set.prefetch_related("content_object", "ads_set") + .filter(Q(commune__type_commune="COM") | Q(commune__isnull=True)) + .order_by("commune__libelle", "epci__name", "prefecture__libelle") + ) def validate_siret(value): diff --git a/mesads/app/views/ads_manager_admin.py b/mesads/app/views/ads_manager_admin.py index 427cc37..ace36f5 100644 --- a/mesads/app/views/ads_manager_admin.py +++ b/mesads/app/views/ads_manager_admin.py @@ -52,7 +52,7 @@ def add_sheets(self, workbook): sheet.set_row(0, None, bold_format) for idx, ads_manager in enumerate( - self.ads_manager_administrator.adsmanager_set.all() + self.ads_manager_administrator.ordered_adsmanager_set() ): status = "" if ads_manager.no_ads_declared: diff --git a/mesads/templates/webpack/pages/ads_register/ads_manager_request.html b/mesads/templates/webpack/pages/ads_register/ads_manager_request.html index 118a23b..4680323 100644 --- a/mesads/templates/webpack/pages/ads_register/ads_manager_request.html +++ b/mesads/templates/webpack/pages/ads_register/ads_manager_request.html @@ -98,10 +98,10 @@