diff --git a/docs/changelog.rst b/docs/changelog.rst index 25ef2f9e8c..27fd29bd5c 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -10,6 +10,10 @@ CHANGELOG - Fix OptionalRangeFilter and CustomDateFromToRangeFilter labels translation (fixes #3852) - Fix crash on migrate when db username or dbname contains dash +**Improvements** + +- Add `report` model on Intervention filters in module list (#3972) + **Documentation** - Improve static pages documentation (#4050 diff --git a/geotrek/maintenance/filters.py b/geotrek/maintenance/filters.py index 898c398881..8e6937b798 100644 --- a/geotrek/maintenance/filters.py +++ b/geotrek/maintenance/filters.py @@ -133,7 +133,7 @@ def __init__(self, *args, **kwargs): class InterventionFilterSet(AltimetryInterventionFilterSet, ZoningFilterSet, StructureRelatedFilterSet): ON_CHOICES = (('infrastructure', _("Infrastructure")), ('signage', _("Signage")), ('blade', _("Blade")), ('topology', _("Path")), ('trek', _("Trek")), ('poi', _("POI")), ('service', _("Service")), - ('trail', _("Trail"))) + ('trail', _("Trail")), ('report', _("Report"))) if 'geotrek.outdoor' in settings.INSTALLED_APPS: ON_CHOICES += (('course', _("Outdoor Course")), ('site', _("Outdoor Site")),) @@ -157,6 +157,11 @@ class Meta(StructureRelatedFilterSet.Meta): 'status', 'type', 'stake', 'subcontracting', 'project', 'contractors', 'on', ] + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + # Sorted 'ON_CHOICES' here to sort with user language. + self.form.fields["on"].choices = sorted(self.ON_CHOICES, key=lambda modelname: modelname[1]) + def filter_year(self, qs, name, values): conditions = Q() for value in values: