Fixed EmailField rendering and validation (MongoEngine#44, MongoEngine#9)

Author: rozza

AUTHORS

@@ -24,4 +24,4 @@ that much better:
 * Marcus Carlsson - https://github.com/xintron
 * RealJTG - https://github.com/RealJTG
 * Peter D. Gray
-* Rodrigue Cloutier
+* Massimo Santini

docs/changelog.rst

@@ -4,6 +4,7 @@ Changelog
 
 Changes in 0.7
 ==============
+- Fixed EmailField rendering and validation (#44, #9)
 - Use help_text for field description (#43)
 - Fixed Pagination and added Document.paginate_field() helper
 - Keep model_forms fields in order of creation

flask_mongoengine/wtf/fields.py

@@ -162,8 +162,8 @@ class NoneStringField(Field):
     def process_formdata(self, valuelist):
         if valuelist:
             self.data = valuelist[0]
-        else:
+        if not self.data:
             self.data = None
 
     def _value(self):
-        return txt_type(self.data) if self.data else None
+        return txt_type(self.data) if self.data else ""

tests/test_forms.py

@@ -32,6 +32,23 @@ def setUp(self):
     def tearDown(self):
         self.db.connection.drop_database(self.db_name)
 
+    def test_emailfield(self):
+
+        with self.app.test_request_context('/'):
+            db = self.db
+
+            class Email(db.Document):
+                email = db.EmailField(required=False)
+
+            EmailForm = model_form(Email)
+            form = EmailForm(instance=Email())
+            self.assertFalse("None" in "%s" % form.email)
+            self.assertTrue(form.validate())
+
+            form = EmailForm(MultiDict({"email": ""}))
+            self.assertFalse("None" in "%s" % form.email)
+            self.assertTrue(form.validate())
+
     def test_model_form(self):
         with self.app.test_request_context('/'):
             db = self.db
@@ -276,7 +293,7 @@ class Post(db.Document):
 
             PostForm = model_form(Post)
             form = PostForm()
-            self.assertTrue("content-text" in form.content.text)
+            self.assertTrue("content-text" in "%s" % form.content.text)
 
 
 if __name__ == '__main__':