diff --git a/config/templates/mail/activation-email.html b/config/templates/mail/activation-email.html index f5081feca60..ea531ee7619 100644 --- a/config/templates/mail/activation-email.html +++ b/config/templates/mail/activation-email.html @@ -17,6 +17,8 @@ the email is sent: - terms_url Your T&Cs URL - contact_email Your galaxy's contact email - instance_resource_url Your galaxy's resource website URL +- expiry_days Days until the activation link expires +- custom_message Your Galaxy config custom_activation_email_message Template begins here >>>>>> diff --git a/config/templates/mail/activation-email.txt b/config/templates/mail/activation-email.txt index 2e3493247b2..37b6674944d 100644 --- a/config/templates/mail/activation-email.txt +++ b/config/templates/mail/activation-email.txt @@ -17,6 +17,8 @@ sent: - terms_url Your T&Cs URL - contact_email Your galaxy's contact email - instance_resource_url Your galaxy's resource website URL +- custom_message Your Galaxy config custom_activation_email_message +- expiry_days Days until the activation link expires Template begins here>>>>>> Thanks for signing up to use Galaxy! diff --git a/lib/galaxy/managers/users.py b/lib/galaxy/managers/users.py index 0756d9b85d1..b7d7377e95e 100644 --- a/lib/galaxy/managers/users.py +++ b/lib/galaxy/managers/users.py @@ -526,6 +526,7 @@ class UserManager(base.ModelManager, deletable.PurgableManagerMixin): 'contact_email': self.app.config.error_email_to, 'instance_resource_url': self.app.config.instance_resource_url, 'custom_message': self.app.config.custom_activation_email_message, + 'expiry_days': self.app.config.activation_grace_period, } body = template.render('mail/activation-email.txt', template_context, self.app.config.templates_dir) html = template.render('mail/activation-email.html', template_context, self.app.config.templates_dir)