Merge branch 'release/1.0.0' into main

Author: erikvw

edc_consent/field_mixins/personal_fields_mixin.py

@@ -31,9 +31,9 @@ class BaseFieldsMixin(models.Model):
         blank=True,
         null=True,
         help_text=format_html(
-            "Required only if participant is a minor.<BR>"
-            "Format is 'LASTNAME, FIRSTNAME'. "
-            "All uppercase separated by a comma."
+            "{}.<BR>{}",
+            "Required only if participant is a minor",
+            "Format is 'LASTNAME, FIRSTNAME'. All uppercase separated by a comma.",
         ),
     )
 

edc_consent/field_mixins/vulnerability_fields_mixin.py

@@ -34,9 +34,9 @@ class VulnerabilityFieldsMixin(CryptoMixin, models.Model):
         blank=True,
         null=True,
         help_text=format_html(
-            "Required only if participant is illiterate.<br>"
-            "Format is 'LASTNAME, FIRSTNAME'. "
-            "All uppercase separated by a comma."
+            "{}.<br>{}",
+            "Required only if participant is illiterate",
+            "Format is 'LASTNAME, FIRSTNAME'. All uppercase separated by a comma.",
         ),
     )
 

edc_consent/modeladmin_mixins/consent_model_admin_mixin.py

@@ -6,6 +6,7 @@
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
 from django.urls import reverse
 from django.utils.html import format_html
+from django.utils.safestring import mark_safe
 from edc_identifier import SubjectIdentifierError, is_subject_identifier_or_raise
 
 from ..actions import flag_as_verified_against_paper, unflag_as_verified_against_paper
@@ -179,13 +180,16 @@ def queries(self, obj=None) -> str:
                 )
             if links:
                 formatted_html = format_html(
-                    "<BR>".join(links) + f'<BR><A title="New query" '
-                    f'href="{new_url}">Add query</A>'
+                    '<BR>{links}<BR><A title="New query" href="{new_url}">Add query</A>',
+                    links=mark_safe("<BR>".join(links)),  # nosec B703 B308
+                    new_url=new_url,
                 )
             else:
                 formatted_html = format_html(
-                    f'<A title="New query" href="{new_url}?"'
-                    f'subject_identifier={obj.subject_identifier}">Add query</A>'
+                    '<A title="New query" href="{new_url}?"'
+                    'subject_identifier={subject_identifier}">Add query</A>',
+                    new_url=new_url,
+                    subject_identifier=obj.subject_identifier,
                 )
         return formatted_html
 

edc_consent/templates/edc_consent/bootstrap3/home.html renamed to edc_consent/templates/edc_consent/home.html

@@ -1,7 +1,6 @@
 from typing import Any
 
 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
 
@@ -10,7 +9,7 @@
 
 
 class HomeView(EdcViewMixin, NavbarViewMixin, TemplateView):
-    template_name = f"edc_consent/bootstrap{get_bootstrap_version()}/home.html"
+    template_name = "edc_consent/home.html"
     navbar_name = "edc_consent"
     navbar_selected_item = "consent"