Merge pull request #2275 from IFRCGo/feature/sitrep-order-by-created-at

SituationReports default ordering
IFRCGo · Sep 29, 2024 · e4f8145 · e4f8145
2 parents dab037c + 216934a
commit e4f8145
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/api/admin.py b/api/admin.py
@@ -732,11 +732,13 @@ class SituationReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin):
         "name",
         "link_to_event",
         "type",
+        "created_at",
         "visibility",
     )
     country_in = "event__countries__in"
     region_in = "event__regions__in"
     autocomplete_fields = ("event",)
+    readonly_fields = ("created_at",)
 
     # WikiJS links added
     change_form_template = "admin/situationreport_change_form.html"

diff --git a/api/drf_views.py b/api/drf_views.py
@@ -776,7 +776,7 @@ class SituationReportTypeViewset(viewsets.ReadOnlyModelViewSet):
 
 
 class SituationReportViewset(ReadOnlyVisibilityViewsetMixin, viewsets.ReadOnlyModelViewSet):
-    queryset = SituationReport.objects.select_related("type")
+    queryset = SituationReport.objects.select_related("type").order_by("created_at")
     authentication_classes = (TokenAuthentication,)
     serializer_class = SituationReportSerializer
     ordering_fields = (