Merge pull request #26435 from open-craft/shimulch/bb-3624-upstream

Fix missing email context values and pass site configuration to better multi-site customization
This commit is contained in:
Sarina Canelake
2021-03-19 08:42:38 -04:00
committed by GitHub
7 changed files with 59 additions and 0 deletions

View File

@@ -28,10 +28,15 @@ def generate_activation_email_context(user, registration):
'key': registration.activation_key,
'lms_url': configuration_helpers.get_value('LMS_ROOT_URL', settings.LMS_ROOT_URL),
'platform_name': configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME),
'contact_mailing_address': configuration_helpers.get_value(
'contact_mailing_address',
settings.CONTACT_MAILING_ADDRESS
),
'support_url': configuration_helpers.get_value(
'ACTIVATION_EMAIL_SUPPORT_LINK', settings.ACTIVATION_EMAIL_SUPPORT_LINK
) or settings.SUPPORT_SITE_LINK,
'support_email': configuration_helpers.get_value('CONTACT_EMAIL', settings.CONTACT_EMAIL),
'site_configuration_values': configuration_helpers.get_current_site_configuration_values(),
})
return context