Rename database_error

bricktracker/views/admin/admin.py

@@ -83,7 +83,7 @@ def admin() -> str:
         configuration=BrickConfigurationList.list(),
         brickset_checkboxes=brickset_checkboxes,
         database_counters=database_counters,
-        database_error=request.args.get('error'),
+        database_error=request.args.get('database_error'),
         database_exception=database_exception,
         database_upgrade_needed=database_upgrade_needed,
         database_version=database_version,

bricktracker/views/admin/database.py

@@ -38,14 +38,18 @@ def delete() -> str:
     return render_template(
         'admin.html',
         delete_database=True,
-        error=request.args.get('error')
+        database_error=request.args.get('database_error')
     )
 
 
 # Actually delete the database
 @admin_database_page.route('/delete', methods=['POST'])
 @login_required
-@exception_handler(__file__, post_redirect='admin_database.delete')
+@exception_handler(
+    __file__,
+    post_redirect='admin_database.delete',
+    error_name='database_error'
+)
 def do_delete() -> Response:
     BrickSQL.delete()
 
@@ -89,14 +93,18 @@ def drop() -> str:
     return render_template(
         'admin.html',
         drop_database=True,
-        error=request.args.get('error')
+        database_error=request.args.get('database_error')
     )
 
 
 # Actually drop the database
 @admin_database_page.route('/drop', methods=['POST'])
 @login_required
-@exception_handler(__file__, post_redirect='admin_database.drop')
+@exception_handler(
+    __file__,
+    post_redirect='admin_database.drop',
+    error_name='database_error'
+)
 def do_drop() -> Response:
     BrickSQL.drop()
 
@@ -108,7 +116,11 @@ def do_drop() -> Response:
 # Actually upgrade the database
 @admin_database_page.route('/upgrade', methods=['POST'])
 @login_required
-@exception_handler(__file__, post_redirect='admin_database.upgrade')
+@exception_handler(
+    __file__,
+    post_redirect='admin_database.upgrade',
+    error_name='database_error'
+)
 def do_upgrade() -> Response:
     BrickSQL(failsafe=True).upgrade()
 
@@ -125,14 +137,18 @@ def upload() -> str:
     return render_template(
         'admin.html',
         import_database=True,
-        error=request.args.get('error')
+        database_error=request.args.get('database_error')
     )
 
 
 # Actually import a database
 @admin_database_page.route('/import', methods=['POST'])
 @login_required
-@exception_handler(__file__, post_redirect='admin_database.upload')
+@exception_handler(
+    __file__,
+    post_redirect='admin_database.upload',
+    error_name='database_error'
+)
 def do_upload() -> Response:
     file = upload_helper(
         'database',
@@ -153,7 +169,7 @@ def do_upload() -> Response:
 # Upgrade the database
 @admin_database_page.route('/upgrade', methods=['GET'])
 @login_required
-@exception_handler(__file__, post_redirect='admin.admin')
+@exception_handler(__file__)
 def upgrade() -> str | Response:
     database = BrickSQL(failsafe=True)
 
@@ -166,5 +182,5 @@ def upgrade() -> str | Response:
         migrations=BrickSQLMigrationList().pending(
             database.version
         ),
-        error=request.args.get('error')
+        database_error=request.args.get('database_error')
     )