Merge branch 'master' of github.com:mrjoes/flask-admin

flask_admin/contrib/peeweemodel/view.py

@@ -277,13 +277,12 @@ class ModelView(BaseModelView):
         try:
             model = self.model()
             form.populate_obj(model)
+            self.on_model_change(form, model)
             model.save()
 
             # For peewee have to save inline forms after model was saved
             save_inline(form, model)
 
-            self.on_model_change(form, model)
-
             return True
         except Exception, ex:
             flash(gettext('Failed to create model. %(error)s', error=str(ex)), 'error')
@@ -292,13 +291,12 @@ class ModelView(BaseModelView):
     def update_model(self, form, model):
         try:
             form.populate_obj(model)
+            self.on_model_change(form, model)
             model.save()
 
             # For peewee have to save inline forms after model was saved
             save_inline(form, model)
 
-            self.on_model_change(form, model)
-
             return True
         except Exception, ex:
             flash(gettext('Failed to update model. %(error)s', error=str(ex)), 'error')

flask_admin/contrib/sqlamodel/view.py

@@ -584,7 +584,6 @@ class ModelView(BaseModelView):
             model = self.model()
             form.populate_obj(model)
             self.session.add(model)
-            self.session.flush()
             self.on_model_change(form, model)
             self.session.commit()
             return True
@@ -605,7 +604,6 @@ class ModelView(BaseModelView):
         try:
             form.populate_obj(model)
             self.on_model_change(form, model)
-            self.session.flush()
             self.session.commit()
             return True
         except Exception, ex: