Merge branch 'dufferzafar/cb-151'

critiquebrainz/frontend/review/forms.py

@@ -1,6 +1,7 @@
 from flask_wtf import Form
 from flask_babel import gettext, Locale
 from wtforms import TextAreaField, RadioField, SelectField, BooleanField, StringField, validators
+from wtforms.validators import ValidationError
 from wtforms.widgets import HiddenInput
 from babel.core import UnknownLocaleError
 from critiquebrainz.data.model.review import supported_languages
@@ -9,6 +10,16 @@
 MIN_REVIEW_LENGTH = 25
 MAX_REVIEW_LENGTH = 100000
 
+
+class StateAndLength(validators.Length):
+    def __call__(self, form, field):
+        if form.state.data == "draft":
+            return
+        l = field.data and len(field.data) or 0
+        if l < self.min or self.max != -1 and l > self.max:
+            raise ValidationError(self.message)
+
+
 # Loading supported languages
 languages = []
 for language_code in supported_languages:
@@ -22,9 +33,9 @@ class ReviewEditForm(Form):
     state = StringField(widget=HiddenInput(), default='draft', validators=[validators.DataRequired()])
     text = TextAreaField(gettext("Text"), [
         validators.DataRequired(message=gettext("Review is empty!")),
-        validators.Length(min=MIN_REVIEW_LENGTH, max=MAX_REVIEW_LENGTH,
-                          message=gettext("Review length needs to be between %(min)d and %(max)d characters.",
-                                          min=MIN_REVIEW_LENGTH, max=MAX_REVIEW_LENGTH))])
+        StateAndLength(min=MIN_REVIEW_LENGTH, max=MAX_REVIEW_LENGTH,
+                       message=gettext("Review length needs to be between %(min)d and %(max)d characters.",
+                                       min=MIN_REVIEW_LENGTH, max=MAX_REVIEW_LENGTH))])
     license_choice = RadioField(
         choices=[
             ('CC BY-SA 3.0', gettext('Allow commercial use of this review (<a href="https://creativecommons.org/licenses/by-sa/3.0/" target="_blank">CC BY-SA 3.0 license</a>)')),