Fix ValueConflictValidator

rdmorganiser · Dec 9, 2023 · fdc796d · fdc796d
1 parent 4a3b094
commit fdc796d
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/rdmo/projects/validators.py b/rdmo/projects/validators.py
@@ -1,7 +1,7 @@
 from datetime import timedelta
 
 from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 from django.utils.dateparse import parse_datetime
 from django.utils.translation import gettext_lazy as _
 
@@ -35,13 +35,16 @@ def __call__(self, data, serializer):
                     set_index=data.get('set_index'),
                     collection_index=data.get('collection_index')
                 )
-                raise serializers.ValidationError({
-                    'conflict': [_('An existing value for this attribute/set_prefix/set_index/collection_index'
-                                  ' was found.')]
-                })
             except ObjectDoesNotExist:
+                return
+            except MultipleObjectsReturned:
                 pass
 
+            raise serializers.ValidationError({
+                'conflict': [_('An existing value for this attribute/set_prefix/set_index/collection_index'
+                              ' was found.')]
+            })
+
 class ValueQuotaValidator:
 
     requires_context = True