Fix caveats in viewset

ISI-MIP · Apr 11, 2024 · 8d942da · 8d942da
1 parent 7f7057e
commit 8d942da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/isimip_data/metadata/serializers.py b/isimip_data/metadata/serializers.py
@@ -218,7 +218,8 @@ def get_caveats_versions(self, obj):
         if self.context.get('request').GET.get('caveats'):
             user = self.context['request'].user
             versions = Dataset.objects.using('metadata').filter(path=obj.path).exclude(id=obj.id)
-            queryset = Caveat.objects.filter(datasets__overlap=[version.id for version in versions]).public(user)
+            queryset = Caveat.objects.exclude(datasets__contains=[obj.id]) \
+                                     .filter(datasets__overlap=[version.id for version in versions]).public(user)
             serializer = DatasetCaveatSerializer(queryset, many=True)
             return serializer.data
 

diff --git a/isimip_data/metadata/views.py b/isimip_data/metadata/views.py
@@ -63,7 +63,7 @@ def dataset(request, pk=None, path=None):
 
     if versions:
         caveats_datasets = list(versions.exclude(id=obj.id).values_list('id', flat=True))
-        caveats_versions = Caveat.objects.exclude(id__in=[caveat.id for caveat in caveats]) \
+        caveats_versions = Caveat.objects.exclude(datasets__contains=[obj.id]) \
                                          .filter(datasets__overlap=caveats_datasets)
     else:
         caveats_versions = None
@@ -104,7 +104,7 @@ def file(request, pk=None, path=None):
 
     if versions:
         caveats_datasets = list(versions.exclude(id=obj.id).values_list('dataset_id', flat=True))
-        caveats_versions = Caveat.objects.exclude(id__in=[caveat.id for caveat in caveats]) \
+        caveats_versions = Caveat.objects.exclude(datasets__contains=[obj.id]) \
                                          .filter(datasets__overlap=caveats_datasets)
     else:
         caveats_versions = None