Merge pull request #1392 from bryhoyt/master

Allow using ModelViews in inline_models, and permit multiple levels of inline-model nesting

flask_admin/contrib/peewee/form.py

@@ -80,6 +80,11 @@ class InlineModelFormList(InlineFieldList):
 
             model.save()
 
+            # Recurse, to save multi-level nested inlines
+            for f in itervalues(field.form._fields):
+                if f.type == 'InlineModelFormList':
+                    f.save_related(model)
+
 
 class CustomModelConverter(ModelConverter):
     def __init__(self, view, additional=None):

flask_admin/contrib/peewee/view.py

@@ -259,6 +259,11 @@ class ModelView(BaseModelView):
                               only=self.form_columns,
                               exclude=self.form_excluded_columns,
                               field_args=self.form_args,
+                              # Allow child to specify pk, so inline_models
+                              # can be ModelViews. But don't auto-generate
+                              # pk field if form_columns is empty -- allow
+                              # default behaviour in that case.
+                              allow_pk=bool(self.form_columns),
                               extra_fields=self.form_extra_fields)
 
         if self.inline_models: