diff --git a/breccia_mapper/settings.py b/breccia_mapper/settings.py index 3c55ead..ba14690 100644 --- a/breccia_mapper/settings.py +++ b/breccia_mapper/settings.py @@ -348,9 +348,6 @@ 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 - do NOT include a trailing forward slash'), 'PARENT_PROJECT_NAME': ( '', 'Parent project name'), @@ -448,9 +445,6 @@ 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 ceacc07..09511ac 100644 --- a/people/fixtures/email_templates.json +++ b/people/fixtures/email_templates.json @@ -7,8 +7,8 @@ "created": "2020-04-27T12:13:30.448Z", "last_updated": "2020-04-27T14:45:27.152Z", "subject": "Welcome to {{config.PROJECT_LONG_NAME}}", - "content": "Dear user,\r\n\r\nWelcome to {{ config.PROJECT_LONG_NAME }}. You can set your password at {{ config.DEPLOYMENT_URL }}/password_reset/.\r\n\r\nThanks,\r\n\r\nThe {{ config.PROJECT_SHORT_NAME }} team", - "html_content": "
Dear user,
Welcome to {{ config.PROJECT_LONG_NAME }}. You can set your password here.
Thanks,
The {{ config.PROJECT_SHORT_NAME }} team
", + "content": "Dear user,\r\n\r\nWelcome to {{ config.PROJECT_LONG_NAME }}. You can set your password at {% block reset_link %}{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}{% endblock %}.\r\n\r\nThanks,\r\n\r\nThe {{ config.PROJECT_SHORT_NAME }} team", + "html_content": "Dear user,
Welcome to {{ config.PROJECT_LONG_NAME }}. {% block reset_link %}You can set your password here.{% endblock %}
Thanks,
The {{ config.PROJECT_SHORT_NAME }} team
", "language": "", "default_template": null }