[#1078] Hide rejected data in the approved list

akvo · Feb 5, 2024 · e0b192e · e0b192e
1 parent beb556b
commit e0b192e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/backend/api/v1/v1_data/views.py b/backend/api/v1/v1_data/views.py
@@ -775,7 +775,12 @@ def list_pending_batch(request, version):
         status=DataApprovalStatus.rejected
     )
     if approved:
-        queryset = queryset.filter(status=DataApprovalStatus.approved)
+        queryset = queryset.filter(
+            status=DataApprovalStatus.approved,
+        )
+        queryset = queryset.exclude(
+            batch_id__in=rejected.values_list('batch_id', flat=True)
+        )
     else:
         if subordinate:
             queryset = queryset.filter(