From 341a619b4bfb62874c7a5c23e977c74c5825824a Mon Sep 17 00:00:00 2001 From: Dosenpfand Date: Sun, 18 Feb 2024 20:26:31 +0100 Subject: [PATCH] Fix pipeline --- app/extended_security/admin.py | 1 + app/templates/base.html | 2 +- migrations/versions/4dc24a017e3e_.py | 1 + migrations/versions/5c38b4252e9a_.py | 1 + migrations/versions/8f1f7de63334_.py | 1 + migrations/versions/8ffa33cf23ae_revert_test_migration.py | 1 + migrations/versions/d211c9345492_test_migration.py | 1 + requirements-dev.txt | 4 ++-- 8 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/extended_security/admin.py b/app/extended_security/admin.py index 8381277..4951b45 100644 --- a/app/extended_security/admin.py +++ b/app/extended_security/admin.py @@ -25,6 +25,7 @@ class AdminModelView(AdminSecurityMixIn, ModelView): column_hide_backrefs = False can_view_details = True can_export = True + export_types = ["csv", "json"] # TODO: CSRF validation fails! # form_base_class = SecureForm diff --git a/app/templates/base.html b/app/templates/base.html index 4925449..83814e1 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -64,7 +64,7 @@ {% for code, lang in config['LANGUAGES'].items() %} {% if not code == session['lang'] %} {% set endpoint = request.url_rule.endpoint - if (request.url_rule.endpoint and (request.url_rule.endpoint not in ['static', 'bootstrap.static'])) + if (request.url_rule.endpoint and (request.url_rule.endpoint not in ['static', 'bootstrap.static', 'admin.static'])) else 'main.home' %} {{ render_nav_item(endpoint, lang, lang=code) }} {% endif %} diff --git a/migrations/versions/4dc24a017e3e_.py b/migrations/versions/4dc24a017e3e_.py index 74ff656..5e64a11 100644 --- a/migrations/versions/4dc24a017e3e_.py +++ b/migrations/versions/4dc24a017e3e_.py @@ -5,6 +5,7 @@ Create Date: 2022-08-29 15:18:21.225770 """ + from alembic import op import sqlalchemy as sa diff --git a/migrations/versions/5c38b4252e9a_.py b/migrations/versions/5c38b4252e9a_.py index 7720f0b..4bc7d13 100644 --- a/migrations/versions/5c38b4252e9a_.py +++ b/migrations/versions/5c38b4252e9a_.py @@ -5,6 +5,7 @@ Create Date: 2022-11-02 20:18:52.593092 """ + from alembic import op import sqlalchemy as sa diff --git a/migrations/versions/8f1f7de63334_.py b/migrations/versions/8f1f7de63334_.py index 1c0ba6f..6f920b6 100644 --- a/migrations/versions/8f1f7de63334_.py +++ b/migrations/versions/8f1f7de63334_.py @@ -5,6 +5,7 @@ Create Date: 2022-11-02 22:46:46.827432 """ + from alembic import op import sqlalchemy as sa diff --git a/migrations/versions/8ffa33cf23ae_revert_test_migration.py b/migrations/versions/8ffa33cf23ae_revert_test_migration.py index c48d651..e8eef39 100644 --- a/migrations/versions/8ffa33cf23ae_revert_test_migration.py +++ b/migrations/versions/8ffa33cf23ae_revert_test_migration.py @@ -5,6 +5,7 @@ Create Date: 2022-06-23 15:41:00.429393 """ + from alembic import op import sqlalchemy as sa diff --git a/migrations/versions/d211c9345492_test_migration.py b/migrations/versions/d211c9345492_test_migration.py index 4058742..f50b0d3 100644 --- a/migrations/versions/d211c9345492_test_migration.py +++ b/migrations/versions/d211c9345492_test_migration.py @@ -5,6 +5,7 @@ Create Date: 2022-06-23 15:39:46.447630 """ + from alembic import op import sqlalchemy as sa diff --git a/requirements-dev.txt b/requirements-dev.txt index 9ef5d8d..3752cc4 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ -black~=22.10 +black~=24.2 pre-commit~=2.19 pytest~=7.1 flake8~=5.0 pytest-cov~=4.0 mypy~=0.982 -types-requests~=2.28 \ No newline at end of file +types-requests~=2.28