Ticket #2266: given_validators.diff

django/core/validators.py

@@ -258 +258 @@
             for v in self.validator_list:
                 v(field_data, all_data)
 
-class RequiredIfOtherFieldNotGiven(object):
-    def __init__(self, other_field_name, error_message=gettext_lazy("Please enter something for at least one field.")):
-        self.other, self.error_message = other_field_name, error_message
+class RequiredIfOtherFieldsNotGiven(object):
+    def __init__(self, other_field_names, error_message=gettext_lazy("Please enter something for at least one field.")):
+        self.other, self.error_message = other_field_names, error_message
         self.always_test = True
 
     def __call__(self, field_data, all_data):
-        if not all_data.get(self.other, False) and not field_data:
+        for field in self.other:
+            if all_data.get(field, False):
+                return
+        if not field_data:
             raise ValidationError, self.error_message
 
+class RequiredIfOtherFieldNotGiven(RequiredIfOtherFieldsNotGiven):
+    def __init__(self, other_field_name, error_message=gettext_lazy("Please enter something for at least one field.")):
+        RequiredIfOtherFieldsNotGiven.__init__(self, [other_field_name], error_message)
+
 class RequiredIfOtherFieldsGiven(object):
     def __init__(self, other_field_names, error_message=gettext_lazy("Please enter both fields or leave them both empty.")):
         self.other, self.error_message = other_field_names, error_message
         self.always_test = True
 
     def __call__(self, field_data, all_data):
+        if field_data:
+            return
         for field in self.other:
-            if all_data.get(field, False) and not field_data:
+            if all_data.get(field, False):
                 raise ValidationError, self.error_message
 
 class RequiredIfOtherFieldGiven(RequiredIfOtherFieldsGiven):

docs/forms.txt

@@ -519 +519 @@
     ``other_vaue``, then the validators in ``validator_list`` are all run
     against the current field.
 
+``RequiredIfOtherFieldGiven``
+    Takes the name of the other field and this field is only required if the
+    other field has a value.
+
+``RequiredIfOtherFieldsGiven``
+    Similar to ``RequiredIfOtherFieldGiven``, except that it takes a list
+    of field names and if any one of the supplied fields has a value
+    provided, the field being validated is required.
+
 ``RequiredIfOtherFieldNotGiven``
     Takes the name of the other field and this field is only required if the
     other field has no value.
 
 ``RequiredIfOtherFieldsNotGiven``
     Similar to ``RequiredIfOtherFieldNotGiven``, except that it takes a list
-    of field names and if any one of the supplied fields does not have a value
-    provided, the field being validated is required.
+    of field names and if none of the supplied fields has a value provided, 
+    the field being validated is required.
 
 ``RequiredIfOtherFieldEquals`` and ``RequiredIfOtherFieldDoesNotEqual``
     Each of these validator classes takes a field name and a value (in that