From 4e82d363bc5922fbae6a48b80701ad9804f10ca5 Mon Sep 17 00:00:00 2001 From: Matthew Grove Date: Sat, 7 Jan 2023 18:44:30 +0000 Subject: [PATCH] [REFACTOR] Use constance variables in email template and add login URL --- breccia_mapper/settings.py | 6 ++++++ people/fixtures/email_templates.json | 6 +++--- people/models/person.py | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/breccia_mapper/settings.py b/breccia_mapper/settings.py index 4980d41..4866006 100644 --- a/breccia_mapper/settings.py +++ b/breccia_mapper/settings.py @@ -348,6 +348,9 @@ CONSTANCE_CONFIG = { 'RELATIONSHIP_FORM_HELP': ( '', 'Help text to display at the top of relationship forms.'), + 'DEPLOYMENT_URL': ( + 'http://localhost', + 'URL at which this mapper tool is accessible'), 'PARENT_PROJECT_NAME': ( '', 'Parent project name'), @@ -441,6 +444,9 @@ CONSTANCE_CONFIG_FIELDSETS = { 'ORGANISATION_LIST_HELP', 'RELATIONSHIP_FORM_HELP', ), + 'Deployment': ( + 'DEPLOYMENT_URL', + ), } # yapf: disable CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend' diff --git a/people/fixtures/email_templates.json b/people/fixtures/email_templates.json index 78a8fd2..a47231b 100644 --- a/people/fixtures/email_templates.json +++ b/people/fixtures/email_templates.json @@ -6,9 +6,9 @@ "description": "Default welcome email template", "created": "2020-04-27T12:13:30.448Z", "last_updated": "2020-04-27T14:45:27.152Z", - "subject": "Welcome to {{settings.PROJECT_LONG_NAME}}", - "content": "Dear {{ user.get_full_name }},\r\n\r\nWelcome to {{ settings.PROJECT_LONG_NAME }}.\r\n\r\nThanks,\r\n\r\nThe {{ settings.PROJECT_LONG_NAME }} team", - "html_content": "

{{ settings.PROJECT_LONG_NAME }}

\r\n\r\nDear {{ user.get_full_name }},\r\n\r\nWelcome to {{ settings.PROJECT_LONG_NAME }}.\r\n\r\nThanks,\r\n\r\nThe {{ settings.PROJECT_LONG_NAME }} team", + "subject": "Welcome to {{config.PROJECT_LONG_NAME}}", + "content": "Dear {{ user.get_full_name }},\r\n\r\nWelcome to {{ config.PROJECT_LONG_NAME }}. You can sign in at {{ config.DEPLOYMENT_URL }}.\r\n\r\nThanks,\r\n\r\nThe {{ config.PROJECT_SHORT_NAME }} team", + "html_content": "

{{ config.PROJECT_LONG_NAME }}

\r\n\r\nDear {{ user.get_full_name }},\r\n\r\nWelcome to {{ config.PROJECT_LONG_NAME }}. You can sign in here.\r\n\r\nThanks,\r\n\r\nThe {{ config.PROJECT_SHORT_NAME }} team", "language": "", "default_template": null } diff --git a/people/models/person.py b/people/models/person.py index 4d572af..91df390 100755 --- a/people/models/person.py +++ b/people/models/person.py @@ -14,6 +14,8 @@ from post_office import mail from .organisation import Organisation from .question import AnswerSet, Question, QuestionChoice +from constance import config + logger = logging.getLogger(__name__) # pylint: disable=invalid-name __all__ = [