Changeset 827:0f14ee78dc4e

Timestamp:

12/30/08 22:59:24 (3 years ago)

Author:

dennda

Branch:

default

Children:

830:556536f6f8b1, 840:4be83bf64ddc

Message:

Fix #135 by making empty strings invalid as value for entry titles and group, user and category names.

Location:

zine

Files:

• forms.py (modified) (6 diffs)
• utils/forms.py (modified) (1 diff)
• utils/validators.py (modified) (1 diff)

zine/forms.py

@@ -23 +23 @@
 from zine.utils.http import redirect_to
 from zine.utils.validators import ValidationError, is_valid_email, \
-     is_valid_url, is_valid_slug, is_netaddr
+     is_valid_url, is_valid_slug, is_netaddr, is_not_whitespace_only
 from zine.utils.redirects import register_redirect, change_url_prefix
 
@@ -221 +221 @@
     """
     title = forms.TextField(lazy_gettext(u'Title'), max_length=150,
-                            required=True)
+                            validators=[is_not_whitespace_only()], required=True)
     text = forms.TextField(lazy_gettext(u'Text'), max_length=65000,
                            widget=forms.Textarea)
@@ -291 +291 @@
         existing = query.first()
         if existing is not None:
-            raise ValidationError(_('This slug is already in use'))
+            raise ValidationError(_('This slug is already in use.'))
 
     def validate_parser(self, value):
@@ -505 +505 @@
 
     slug = forms.TextField(lazy_gettext(u'Slug'), validators=[is_valid_slug()])
-    name = forms.TextField(lazy_gettext(u'Name'), max_length=50, required=True)
+    name = forms.TextField(lazy_gettext(u'Name'), max_length=50, required=True,
+                           validators=[is_not_whitespace_only()])
     description = forms.TextField(lazy_gettext(u'Description'),
                                   max_length=5000, widget=forms.Textarea)
@@ -609 +610 @@
 
     groupname = forms.TextField(lazy_gettext(u'Groupname'), max_length=30,
-                           required=True)
+                                validators=[is_not_whitespace_only()],
+                                required=True)
     privileges = forms.MultiChoiceField(lazy_gettext(u'Privileges'),
                                         widget=forms.CheckboxGroup)
@@ -706 +708 @@
 
     username = forms.TextField(lazy_gettext(u'Username'), max_length=30,
+                               validators=[is_not_whitespace_only()],
                                required=True)
     real_name = forms.TextField(lazy_gettext(u'Realname'), max_length=180)

zine/utils/forms.py

@@ -974 +974 @@
         validation if the field is empty and not required.
 
-        For example a validator like `is_valid_ip` is never alled if the
+        For example a validator like `is_valid_ip` is never called if the
         value is an empty string and the field hasn't raised a validation
         error when checking if the field is required.

zine/utils/validators.py

@@ -156 +156 @@
                 raise ValidationError(_(u'URL prefix must not end with a slash.'))
     return validator
+
+def is_not_whitespace_only():
+    """Make sure the value does consist of at least one
+    non-whitespace character"""
+    def validator(form, value):
+        if not value.strip():
+            raise ValidationError(_('At least one non-whitespace character '
+                                    'is required.'))
+    return validator