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

ACM v0.26
UW-GAC · Nov 12, 2024 · 7cb7ebd · 7cb7ebd
2 parents d637f51 + b27ff1c
commit 7cb7ebd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -394,12 +394,6 @@
 ANVIL_ACCOUNT_ADAPTER = "primed.primed_anvil.adapters.AccountAdapter"
 ANVIL_MANAGED_GROUP_ADAPTER = "primed.primed_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")

diff --git a/primed/primed_anvil/adapters.py b/primed/primed_anvil/adapters.py
@@ -18,6 +18,9 @@ class AccountAdapter(BaseAccountAdapter):
 
     list_table_class = AccountTable
     list_filterset_class = 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`."""

diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -38,7 +38,7 @@ django-dbbackup # https://github.com/jazzband/django-dbbackup
 django-extensions  # https://github.com/django-extensions/django-extensions
 
 # anvil_consortium_manager
-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

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -57,7 +57,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