Merge branch 'raise-on-integrity-error-exception'

38f22da2 · PJ Janse van Rensburg · 5503ee5f · 45617b91 · 38f22da2
Commit 38f22da2 authored Oct 22, 2018 by PJ Janse van Rensburg
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

view.py flask_admin/contrib/sqla/view.py +4 -1

No files found.
--- a/flask_admin/contrib/sqla/view.py
+++ b/flask_admin/contrib/sqla/view.py
@@ -1081,7 +1081,10 @@ class ModelView(BaseModelView):
    # Error handler
    def handle_view_exception(self, exc):
        if isinstance(exc, IntegrityError):
-            if current_app.config.get('ADMIN_RAISE_ON_VIEW_EXCEPTION'):
+            if current_app.config.get(
+                'ADMIN_RAISE_ON_INTEGRITY_ERROR',
+                current_app.config.get('ADMIN_RAISE_ON_VIEW_EXCEPTION')
+            ):
                raise
            else:
                flash(gettext('Integrity error. %(message)s', message=text_type(exc)), 'error')