Changeset 1299:fb540c42162b

Timestamp:

01/11/10 22:18:43 (2 years ago)

Author:

mitsuhiko

Branch:

default

rebase_source:

2e55f41bb43c44448dd345aaa05ba1b65160d816

Message:

No longer possible to commit empty comments.

Location:

zine

Files:

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

zine/forms.py

@@ -109 +109 @@
     )])
     body = forms.TextField(lazy_gettext(u'Text'), min_length=2, max_length=6000,
-                           messages=dict(
+                           required=True, messages=dict(
         too_short=lazy_gettext(u'Your comment is too short.'),
         too_long=lazy_gettext(u'Your comment is too long.'),
@@ -140 +140 @@
         if not self.post.comments_enabled:
             raise ValidationError(_('Post is closed for commenting.'))
-        elif self.post.comments_closed:
+        if self.post.comments_closed:
             raise ValidationError(_('Commenting is no longer possible.'))
 

zine/utils/forms.py

@@ -1250 +1250 @@
     def convert(self, value):
         value = _to_string(value)
-        if self.required:
-            if not value:
-                raise ValidationError(self.messages['required'])
-        elif value:
+        if self.required and not value:
+            raise ValidationError(self.messages['required'])
+        if value:
             if self.min_length is not None and len(value) < self.min_length:
                 message = self.messages['too_short']