Merge branch 'hotfix/23.16.5' into develop

Johnetordoff · Dec 7, 2023 · ee87e96 · ee87e96
2 parents 3d3bfdc + 9e0322d
commit ee87e96
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 0 deletions.
diff --git a/framework/auth/campaigns.py b/framework/auth/campaigns.py
@@ -91,6 +91,15 @@ def get_campaigns():
                 }
             })
 
+            newest_campaigns.update({
+                'agu_conference_2023': {
+                    'system_tag': CampaignSourceTags.AguConference2023.value,
+                    'redirect_url': furl.furl(DOMAIN).add(path='dashboard/').url,
+                    'confirmation_email_template': mails.CONFIRM_EMAIL_AGU_CONFERENCE_2023,
+                    'login_type': 'native',
+                }
+            })
+
             CAMPAIGNS = newest_campaigns
             CAMPAIGNS_LAST_REFRESHED = timezone.now()
 

diff --git a/tests/test_campaigns.py b/tests/test_campaigns.py
@@ -44,6 +44,7 @@ def setUp(self):
             'psyarxiv-preprints',
             'osf-registries',
             'osf-registered-reports',
+            'agu_conference_2023',
         ]
         self.refresh = timezone.now()
         campaigns.CAMPAIGNS = None  # force campaign refresh now that preprint providers are populated

diff --git a/website/mails/mails.py b/website/mails/mails.py
@@ -188,6 +188,10 @@ def get_english_article(word):
     'confirm_erpc',
     subject='OSF Account Verification, Election Research Preacceptance Competition'
 )
+CONFIRM_EMAIL_AGU_CONFERENCE_2023 = Mail(
+    'confirm_agu_conference_2023',
+    subject='OSF Account Verification, from the American Geophysical Union Conference'
+)
 CONFIRM_EMAIL_PREPRINTS = lambda name, provider: Mail(
     'confirm_preprints_{}'.format(name),
     subject='OSF Account Verification, {}'.format(provider)

diff --git a/website/templates/emails/confirm_agu_conference_2023.html.mako b/website/templates/emails/confirm_agu_conference_2023.html.mako
@@ -0,0 +1,25 @@
+<%inherit file="notify_base.mako" />
+
+<%def name="content()">
+<tr>
+  <td style="border-collapse: collapse;">
+    Hello ${user.fullname},<br>
+    <br>
+
+    Thank you for joining us at the AGU Open Science Pavilion, and welcome to the Open Science Framework.
+
+    We are pleased to offer a special AGU attendees exclusive community call to continue our conversation and to help
+    you get oriented on the OSF. This is an opportunity for us to show you useful OSF features, talk about
+    open science in your domains, and for you to ask any questions you may have.
+    You can register for this free event here:
+    <br>
+    https://cos-io.zoom.us/meeting/register/tZAuceCvrjotHNG3n6XzLFDv1Rnn2hkjczHr
+    <br><br>
+    To confirm your OSF account, please verify your email address by visiting this link:<br>
+    <br>
+    ${confirmation_url}<br>
+    <br>
+    From the team at the Center for Open Science<br>
+
+</tr>
+</%def>
diff --git a/website/util/metrics.py b/website/util/metrics.py
@@ -49,6 +49,7 @@ class CampaignSourceTags(Enum):
     ErpChallenge = campaign_source_tag('erp_challenge')
     OsfRegisteredReports = campaign_source_tag('osf_registered_reports')
     Osf4m = campaign_source_tag('osf4m')
+    AguConference2023 = campaign_source_tag('agu_conference_2023')
 
 
 class OsfClaimedTags(Enum):