diff --git a/requirements.txt b/requirements.txt index aa65c99..6615aa2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,3 +41,4 @@ django-filter==2.0.0 whitenoise==4.1.4 jsonschema==3.2.0 mailjet-rest==1.3.3 +markdown==3.2.2 diff --git a/webapp/templates/signup_email.html b/webapp/templates/signup_email.html index 1a66b4a..659ce67 100644 --- a/webapp/templates/signup_email.html +++ b/webapp/templates/signup_email.html @@ -1,7 +1,9 @@ +{% autoescape off %} {{ content }} +{% endautoescape %} -Voit muokata ilmoittautumistasi lomakkeen olleessa avoinna alla olevasta linkistä: +

Voit muokata ilmoittautumistasi lomakkeen olleessa avoinna alla olevasta linkistä:

-{{ url }} +{{url}} -Hädässä ota yhteyttä sik-vtmk@list.ayy.fi \ No newline at end of file +

Hädässä ota yhteyttä sik-vtmk@list.ayy.fi

\ No newline at end of file diff --git a/webapp/utils.py b/webapp/utils.py index 5b0a784..1f60f3a 100644 --- a/webapp/utils.py +++ b/webapp/utils.py @@ -14,6 +14,7 @@ import base64 import uuid from sikweb.settings import FRONTEND_URL, URL, EMAIL_API_KEY, EMAIL_API_SECRET, DEFAULT_EMAIL_FROM, DEFAULT_EMAIL_FROM_ADDR, ENABLE_AUTOMATIC_EMAILS import imghdr +import markdown def get_file_extension(file_name, decoded_file): @@ -95,8 +96,8 @@ def send_signup_email(to, subject, id, uuid, content): message = render_to_string( 'webapp:signup_email.html', { 'url': f"https://{FRONTEND_URL}/signup/edit/{id}/{uuid}", - 'content': content, + 'content': markdown.markdown(content), } ) - return send_email(to, subject, message) + return send_email(to, subject, message, True)