Merge branch 'release/1.0.0' into main

clinicedc · Jan 21, 2025 · 22b6882 · 22b6882
2 parents 0a9658d + 56b21a9
commit 22b6882
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 9 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ exclude: tests/etc/user-*
 
 repos:
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.10
+    rev: 1.8.2
     hooks:
       - id: bandit
         args:

diff --git a/.../edc_export/bootstrap3/export_models.html → ...t/templates/edc_export/export_models.html b/.../edc_export/bootstrap3/export_models.html → ...t/templates/edc_export/export_models.html
diff --git a/...templates/edc_export/bootstrap3/home.html → edc_export/templates/edc_export/home.html b/...templates/edc_export/bootstrap3/home.html → edc_export/templates/edc_export/home.html
diff --git a/edc_export/tests/test_settings.py b/edc_export/tests/test_settings.py
@@ -13,7 +13,6 @@
     BASE_DIR=base_dir,
     ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
     SILENCED_SYSTEM_CHECKS=["sites.E101", "edc_navbar.E002", "edc_navbar.E003"],
-    EDC_BOOTSTRAP=3,
     EDC_SITES_REGISTER_DEFAULT=True,
     SUBJECT_SCREENING_MODEL="export_app.subjectscreening",
     SUBJECT_CONSENT_MODEL="export_app.subjectconsent",

diff --git a/edc_export/utils.py b/edc_export/utils.py
@@ -64,7 +64,8 @@ def raise_if_prohibited_from_export_pii_group(username: str, groups: Iterable) -
             {
                 "groups": format_html(
                     "This user is not allowed to export PII data. You may not add "
-                    f"this user to the <U>{EXPORT_PII}</U> group."
+                    "this user to the <U>{}</U> group.",
+                    "EXPORT_PII",
                 )
             }
         )
diff --git a/edc_export/views/export_models_view.py b/edc_export/views/export_models_view.py
@@ -3,15 +3,14 @@
 from django.contrib import messages
 from django.contrib.auth.models import User
 from django.views.generic.base import TemplateView
-from edc_dashboard.utils import get_bootstrap_version
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_navbar import NavbarViewMixin
 
 from ..exportables import Exportables
 
 
 class ExportModelsView(EdcViewMixin, NavbarViewMixin, TemplateView):
-    template_name = f"edc_export/bootstrap{get_bootstrap_version()}/export_models.html"
+    template_name = "edc_export/export_models.html"
     navbar_name = "edc_export"
     navbar_selected_item = "export"
 

diff --git a/edc_export/views/export_selected_models_view.py b/edc_export/views/export_selected_models_view.py
@@ -12,7 +12,6 @@
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django.views.generic.base import TemplateView
-from edc_dashboard.utils import get_bootstrap_version
 from edc_dashboard.view_mixins import EdcViewMixin
 
 from ..archive_exporter import (
@@ -39,7 +38,7 @@ class ExportModelsViewError(Exception):
 
 class ExportSelectedModelsView(EdcViewMixin, TemplateView):
     post_action_url = "edc_export:export_models_url"
-    template_name = f"edc_export/bootstrap{get_bootstrap_version()}/export_models.html"
+    template_name = "edc_export/export_models.html"
 
     def get_context_data(self, **kwargs) -> dict:
         if self.request.session.get("selected_models"):

diff --git a/edc_export/views/home_view.py b/edc_export/views/home_view.py
@@ -1,10 +1,9 @@
 from django.views.generic import TemplateView
-from edc_dashboard.utils import get_bootstrap_version
 from edc_dashboard.view_mixins import EdcViewMixin
 from edc_navbar import NavbarViewMixin
 
 
 class HomeView(EdcViewMixin, NavbarViewMixin, TemplateView):
-    template_name = f"edc_export/bootstrap{get_bootstrap_version()}/home.html"
+    template_name = "edc_export/home.html"
     navbar_name = "edc_export"
     navbar_selected_item = "export"