Merge pull request #215 from Nobatek/dev_JL_textarea

Add field argument to force TextAreaField on StringField with max_length

Author: losintikfos

flask_mongoengine/wtf/orm.py

@@ -103,12 +103,11 @@ def conv_String(self, model, field, kwargs):
         if field.regex:
             kwargs['validators'].append(validators.Regexp(regex=field.regex))
         self._string_common(model, field, kwargs)
-        if 'password' in kwargs:
-            if kwargs.pop('password'):
-                return f.PasswordField(**kwargs)
-        if field.max_length:
-            return f.StringField(**kwargs)
-        return f.TextAreaField(**kwargs)
+        if kwargs.pop('password', False):
+            return f.PasswordField(**kwargs)
+        if kwargs.pop('textarea', False) or not field.max_length:
+            return f.TextAreaField(**kwargs)
+        return f.StringField(**kwargs)
 
     @converts('URLField')
     def conv_URL(self, model, field, kwargs):

tests/test_forms.py

@@ -115,14 +115,17 @@ class BlogPost(db.Document):
 
             class TextPost(BlogPost):
                 email = db.EmailField(required=False)
+                lead_paragraph = db.StringField(max_length=200)
                 content = db.StringField(required=True)
 
             class LinkPost(BlogPost):
-                url = db.StringField(required=True)
-                interest =  db.DecimalField(required=True)
+                url = db.StringField(required=True, max_length=200)
+                interest = db.DecimalField(required=True)
 
             # Create a text-based post
-            TextPostForm = model_form(TextPost)
+            TextPostForm = model_form(
+                TextPost,
+                field_args={'lead_paragraph': {'textarea': True}})
 
             form = TextPostForm(MultiDict({
                 'title': 'Using MongoEngine',
@@ -138,6 +141,10 @@ class LinkPost(BlogPost):
             self.assertTrue(form.validate())
             form.save()
 
+            self.assertEqual(form.title.type, 'StringField')
+            self.assertEqual(form.content.type, 'TextAreaField')
+            self.assertEqual(form.lead_paragraph.type, 'TextAreaField')
+
             self.assertEquals(BlogPost.objects.first().title, 'Using MongoEngine')
             self.assertEquals(BlogPost.objects.count(), 1)