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

flask_admin/contrib/sqla/view.py

@@ -786,7 +786,7 @@ class ModelView(BaseModelView):
             flash(gettext('Integrity error. %(message)s', message=exc.message), 'error')
             return True
 
-        return super(BaseModelView, self).handle_view_exception(exc)
+        return super(ModelView, self).handle_view_exception(exc)
 
     # Model handlers
     def create_model(self, form):

flask_admin/static/admin/js/form.js

@@ -138,7 +138,7 @@
 
         var $parentForm = $el.parent().closest('.inline-field');
 
-        if ($parentForm.length > 0) {
+        if ($parentForm.length > 0 && elID.indexOf($parentForm.attr('id')) !== 0) {
           id = $parentForm.attr('id') + '-' + elID;
         }