From 9dafccf45c2eae19559fedcc6912c5f7587582bb Mon Sep 17 00:00:00 2001
From: Stein Elgethun <stein.elgethun@usit.uio.no>
Date: Wed, 6 Oct 2021 13:42:34 +0200
Subject: [PATCH] Get instance name from settings when sending mail
Issue: GREG-42
---
gregui/mailutils.py | 3 ++-
gregui/tests/test_mailutils.py | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gregui/mailutils.py b/gregui/mailutils.py
index 4968c978..06b624d6 100644
--- a/gregui/mailutils.py
+++ b/gregui/mailutils.py
@@ -1,3 +1,4 @@
+from django.conf import settings
from django.core.mail import send_mail
from django.template.loader import render_to_string
@@ -22,7 +23,7 @@ def confirmation_template(guest) -> str:
def send_registration_mail(mail_to, sponsor) -> int:
return send_mail(
subject="Subject",
- message=registration_template("UiO", sponsor),
+ message=registration_template(settings.INSTANCE_NAME, sponsor),
from_email=None,
recipient_list=[mail_to]
)
diff --git a/gregui/tests/test_mailutils.py b/gregui/tests/test_mailutils.py
index 3e664d37..f775ed6b 100644
--- a/gregui/tests/test_mailutils.py
+++ b/gregui/tests/test_mailutils.py
@@ -8,14 +8,14 @@ from gregui import mailutils
def test_registration_template():
prefilled_template = """Dette er en automatisk generert melding fra gjestregistreringstjenesten.
-Du har blitt registrert som gjest på UiO av Foo Bar.
+Du har blitt registrert som gjest på InstanceName av Foo Bar.
For å fullføre registreringen av gjestekontoen følg denne lenken: www.google.com
This message has been automatically generated by the guest registration system.
-You have been registered as a guest at UiO by Foo Bar.
+You have been registered as a guest at InstanceName by Foo Bar.
To complete the registration of your guest account, please follow this link: www.google.com
"""
- rendered_template = mailutils.registration_template("UiO", "Foo Bar")
+ rendered_template = mailutils.registration_template("InstanceName", "Foo Bar")
assert rendered_template == prefilled_template
--
GitLab