Merge pull request #691 from arsgeografica/wtf2

WForms2 compatibility – resumed

.travis.yml

@@ -4,7 +4,11 @@ python:
   - "2.7"
   - "3.3"
 
-install: "pip install -r travis.txt --use-mirrors"
+env:
+  - REQUIREMENTS=travis_wtf1.txt
+  - REQUIREMENTS=travis_wtf2.txt
+
+install: "pip install -r $REQUIREMENTS --use-mirrors"
 
 services: mongodb
 

flask_admin/model/fields.py

@@ -15,7 +15,11 @@ class InlineFieldList(FieldList):
 
     def __call__(self, **kwargs):
         # Create template
-        template = self.unbound_field.bind(form=None, name='')
+        meta = getattr(self, 'meta', None)
+        if meta:
+            template = self.unbound_field.bind(form=None, name='', _meta=meta)
+        else:
+            template = self.unbound_field.bind(form=None, name='')
         # Small hack to remove separator from FormField
         if isinstance(template, FormField):
             template.separator = ''

travis_wtf2.txt

+Flask>=0.7
+wtforms>=2.0
+Flask-SQLAlchemy>=0.15
+peewee
+wtf-peewee
+flask-mongoengine
+pillow