Merge pull request #258 from Georiviere/improve_admin_customcontribution

Improve admin customcontribution

georiviere/contribution/admin.py

@@ -120,7 +120,7 @@ class CustomContribAttachmentInline(GenericTabularInline):
 
 @admin.register(models.CustomContribution)
 class CustomContributionAdmin(LeafletGeoAdmin, admin.ModelAdmin):
-    list_display = ("custom_type", "portal", "validated", "date_insert", "date_update")
+    list_display = ("custom_type", "portal", "validated", "contributed_at", "date_insert", "date_update")
     list_filter = ("custom_type", "portal", "validated")
     form = forms.CustomContributionForm
     inlines = [CustomContribAttachmentInline]

georiviere/portal/views/contribution.py

@@ -294,9 +294,6 @@ class CustomContributionViewSet(
     mixins.ListModelMixin,
     viewsets.GenericViewSet,
 ):
-    queryset = CustomContribution.objects.filter(validated=True).annotate(
-        geometry=Transform(F("geom"), settings.API_SRID)
-    ).prefetch_related("attachments")
     serializer_class = CustomContributionSerializer
     geojson_serializer_class = CustomContributionGeoJSONSerializer
     renderer_classes = (
@@ -311,6 +308,13 @@ class CustomContributionViewSet(
     permission_classes = [permissions.AllowAny]
     pagination_class = LimitOffsetPagination
 
+    def get_queryset(self):
+        portal_pk = self.kwargs["portal_pk"]
+        queryset = CustomContribution.objects.filter(portal_id=portal_pk, validated=True).annotate(
+            geometry=Transform(F("geom"), settings.API_SRID)
+        ).prefetch_related("attachments")
+        return queryset
+
     def retrieve(self, request, *args, **kwargs):
         """ Customize retrieve method to add custom type values to the response"""
         object = self.get_object()