1
0
mirror of https://github.com/django/django.git synced 2025-10-27 07:36:08 +00:00

Fixed #4469 -- Added slightly more informative error messages to max- and

min-length newform validation. Based on a patch from A. Murat Eren.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick
2007-07-13 14:13:35 +00:00
parent 3eb1071b3d
commit 40bb32b5a4
3 changed files with 25 additions and 24 deletions

View File

@@ -111,10 +111,11 @@ class CharField(Field):
if value in EMPTY_VALUES:
return u''
value = smart_unicode(value)
if self.max_length is not None and len(value) > self.max_length:
raise ValidationError(ugettext(u'Ensure this value has at most %d characters.') % self.max_length)
if self.min_length is not None and len(value) < self.min_length:
raise ValidationError(ugettext(u'Ensure this value has at least %d characters.') % self.min_length)
value_length = len(value)
if self.max_length is not None and value_length > self.max_length:
raise ValidationError(ugettext(u'Ensure this value has at most %d characters (it has %d).') % (self.max_length, value_length))
if self.min_length is not None and value_length < self.min_length:
raise ValidationError(ugettext(u'Ensure this value has at least %d characters (it has %d).') % (self.min_length, value_length))
return value
def widget_attrs(self, widget):