From fe8d95f93e11d801d07c8852b12abb4f6b21e1e6 Mon Sep 17 00:00:00 2001 From: Aider Ibragimov Date: Thu, 19 Feb 2015 18:03:44 +0300 Subject: Skip validation of NULL field only if it part of unique_together --- rest_framework/validators.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'rest_framework/validators.py') diff --git a/rest_framework/validators.py b/rest_framework/validators.py index c030abdb..ab361614 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -140,7 +140,10 @@ class UniqueTogetherValidator: queryset = self.exclude_current_instance(attrs, queryset) # Ignore validation if any field is None - if None not in attrs.values() and queryset.exists(): + checked_values = [ + value for field, value in attrs.items() if field in self.fields + ] + if None not in checked_values and queryset.exists(): field_names = ', '.join(self.fields) raise ValidationError(self.message.format(field_names=field_names)) -- cgit v1.2.3