From 8f09ca5553d042253604cd4d6a0f060dc747a8b9 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 21 Dec 2020 18:02:37 +0100 Subject: [PATCH] URLs in mails were missing domains --- .../templates/participation/mails/request_validation.html | 4 +++- .../templates/participation/mails/request_validation.txt | 2 +- apps/participation/views.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/participation/templates/participation/mails/request_validation.html b/apps/participation/templates/participation/mails/request_validation.html index 9693d0a..bc9da86 100644 --- a/apps/participation/templates/participation/mails/request_validation.html +++ b/apps/participation/templates/participation/mails/request_validation.html @@ -13,7 +13,9 @@ Bonjour {{ user.registration }}, L'équipe « {{ team.name }} » ({{ team.trigram }}) vient de demander à valider son équipe pour participer au {{ team.participation.get_problem_display }} des Correspondances des Jeunes Mathématicien·ne·s. Vous pouvez décider d'accepter ou de refuser l'équipe en vous rendant sur la page de l'équipe : -{% url "participation:team_detail" pk=team.pk %} + + https://{{ domain }}{% url "participation:team_detail" pk=team.pk %} +

diff --git a/apps/participation/templates/participation/mails/request_validation.txt b/apps/participation/templates/participation/mails/request_validation.txt index 6bd4f3e..522f173 100644 --- a/apps/participation/templates/participation/mails/request_validation.txt +++ b/apps/participation/templates/participation/mails/request_validation.txt @@ -3,7 +3,7 @@ Bonjour {{ user.registration }}, L'équipe « {{ team.name }} » ({{ team.trigram }}) vient de demander à valider son équipe pour participer au {{ team.participation.get_problem_display }} des Correspondances des Jeunes Mathématicien·ne·s. Vous pouvez décider d'accepter ou de refuser l'équipe en vous rendant sur la page de l'équipe : -{% url "participation:team_detail" pk=team.pk %} +https://{{ domain }}{% url "participation:team_detail" pk=team.pk %} Cordialement, diff --git a/apps/participation/views.py b/apps/participation/views.py index 5534278..1cb03b3 100644 --- a/apps/participation/views.py +++ b/apps/participation/views.py @@ -5,6 +5,7 @@ from corres2math.lists import get_sympa_client from corres2math.matrix import Matrix from corres2math.views import AdminMixin from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.sites.models import Site from django.core.exceptions import PermissionDenied from django.core.mail import send_mail from django.db import transaction @@ -208,7 +209,7 @@ class TeamDetailView(LoginRequiredMixin, FormMixin, ProcessFormView, DetailView) self.object.participation.save() for admin in AdminRegistration.objects.all(): - mail_context = dict(user=admin.user, team=self.object) + mail_context = dict(user=admin.user, team=self.object, domain=Site.objects.first().domain) mail_plain = render_to_string("participation/mails/request_validation.txt", mail_context) mail_html = render_to_string("participation/mails/request_validation.html", mail_context) admin.user.email_user("[Corres2math] Validation d'équipe", mail_plain, html_message=mail_html)