Merge branch 'release/0.3.56' into main

clinicedc · Sep 25, 2023 · 1a1d21c · 1a1d21c
2 parents e9055c5 + a165aaa
commit 1a1d21c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,3 +2,4 @@ include AUTHORS CHANGES LICENSE VERSION
 include MANIFEST.in
 include *.rst
 recursive-include edc_consent/templates *
+include */locale/*/LC_MESSAGES/*.mo
diff --git a/edc_consent/modeladmin_mixins/consent_model_admin_mixin.py b/edc_consent/modeladmin_mixins/consent_model_admin_mixin.py
@@ -1,4 +1,4 @@
-from typing import Tuple
+from __future__ import annotations
 
 from django.apps import apps as django_apps
 from django.conf import settings
@@ -17,10 +17,10 @@ class ConsentModelAdminMixin:
     actions = (flag_as_verified_against_paper, unflag_as_verified_against_paper)
 
     def __init__(self, *args):
-        self.get_radio_fields()
+        self.update_radio_fields()
         super().__init__(*args)
 
-    def get_radio_fields(self):
+    def update_radio_fields(self) -> None:
         self.radio_fields.update(
             {
                 "language": admin.VERTICAL,
@@ -37,7 +37,7 @@ def get_radio_fields(self):
             }
         )
 
-    def get_fields(self, request, obj=None) -> Tuple[str, ...]:
+    def get_fields(self, request, obj=None) -> tuple[str, ...]:
         original_fields = super().get_fields(request, obj=obj)
         return (
             "subject_identifier",
@@ -63,7 +63,7 @@ def get_fields(self, request, obj=None) -> Tuple[str, ...]:
             "consent_copy",
         ) + original_fields
 
-    def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
+    def get_readonly_fields(self, request, obj=None) -> tuple[str, ...]:
         readonly_fields = super().get_readonly_fields(request, obj)
         fields = ("subject_identifier", "subject_identifier_as_pk")
         if obj:
@@ -73,22 +73,15 @@ def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
         else:
             return fields + readonly_fields
 
-    def get_search_fields(self, request) -> Tuple[str, ...]:
-        search_fields = super().get_search_fields(request)
+    def get_search_fields(self, request) -> tuple[str, ...]:
+        search_fields: tuple[str] = super().get_search_fields(request)
+        name_fields: tuple[str] = tuple(self.name_fields)
         return tuple(
-            set(
-                search_fields
-                + (
-                    "id",
-                    "subject_identifier",
-                    *self.name_fields,
-                    "identity",
-                )
-            )
+            set(search_fields + ("id", "subject_identifier", *name_fields, "identity"))
         )
 
-    def get_list_display(self, request) -> tuple:
-        list_display = super().get_list_display(request)
+    def get_list_display(self, request) -> tuple[str, ...]:
+        list_display: tuple[str] = super().get_list_display(request)
         custom_fields = (
             "subject_identifier",
             "is_verified",
@@ -112,7 +105,7 @@ def get_list_display(self, request) -> tuple:
         )
         return fields
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = (
             "gender",