Merge pull request #831 from UW-GAC/maint/acm-v0.26

ACM v0.26

config/settings/base.py

@@ -388,12 +388,6 @@
 ANVIL_ACCOUNT_ADAPTER = "gregor_django.gregor_anvil.adapters.AccountAdapter"
 ANVIL_MANAGED_GROUP_ADAPTER = "gregor_django.gregor_anvil.adapters.ManagedGroupAdapter"
 
-# Specify the URL name that AccountLink and AccountLinkVerify redirect to.
-ANVIL_ACCOUNT_LINK_REDIRECT = "users:redirect"
-# Specify the subject for AnVIL account verification emails.
-ANVIL_ACCOUNT_LINK_EMAIL_SUBJECT = "Verify your AnVIL account email"
-ANVIL_ACCOUNT_VERIFY_NOTIFICATION_EMAIL = "[email protected]"
-
 DRUPAL_API_CLIENT_ID = env("DRUPAL_API_CLIENT_ID", default="")
 DRUPAL_API_CLIENT_SECRET = env("DRUPAL_API_CLIENT_SECRET", default="")
 DRUPAL_API_REL_PATH = env("DRUPAL_API_REL_PATH", default="mockapi")

gregor_django/gregor_anvil/adapters.py

@@ -67,6 +67,9 @@ class AccountAdapter(BaseAccountAdapter):
 
     list_table_class = tables.AccountTable
     list_filterset_class = filters.AccountListFilter
+    account_link_verify_redirect = "users:redirect"
+    account_link_email_subject = "Verify your AnVIL account email"
+    account_verify_notification_email = "[email protected]"
 
     def get_autocomplete_queryset(self, queryset, q):
         """Filter to Accounts where the email or the associated user name matches the query `q`."""

requirements/requirements.in

@@ -35,7 +35,7 @@ django-extensions  # https://github.com/django-extensions/django-extensions
 # Bootstrap5 templates for crispy-forms
 crispy-bootstrap5  # https://github.com/django-crispy-forms/crispy-bootstrap5
 
-django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.25
+django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.26
 # Simple history - model history tracking
 django-simple-history
 

requirements/requirements.txt

@@ -52,7 +52,7 @@ django==4.2.16
     #   django-tables2
 django-allauth==65.1.0
     # via -r requirements/requirements.in
-django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.25
+django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.26
     # via -r requirements/requirements.in
 django-autocomplete-light==3.11.0
     # via django-anvil-consortium-manager