From 84a39b41f21b7d443b1f6b4e196eb91c3c402afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Wed, 15 Mar 2017 18:35:42 +0000 Subject: [PATCH] Fix wrong email generation in _traitement_post (2) I forgot to fix an email in commit c51379447. Now there are all well-formed --- gestioncof/petits_cours_views.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gestioncof/petits_cours_views.py b/gestioncof/petits_cours_views.py index 141f8339..95fdf3b7 100644 --- a/gestioncof/petits_cours_views.py +++ b/gestioncof/petits_cours_views.py @@ -246,11 +246,14 @@ def _traitement_post(request, demande): proposals_list = proposals.items() proposed_for = proposed_for.items() proposed_mails = _generate_eleve_email(demande, proposed_for) - mainmail = render_custom_mail("petits-cours-mail-demandeur", { - "proposals": proposals_list, - "unsatisfied": unsatisfied, - "extra": extra, - }) + mainmail_object, mainmail_body = render_custom_mail( + "petits-cours-mail-demandeur", + { + "proposals": proposals_list, + "unsatisfied": unsatisfied, + "extra": extra + } + ) frommail = settings.MAIL_DATA['petits_cours']['FROM'] bccaddress = settings.MAIL_DATA['petits_cours']['BCC'] replyto = settings.MAIL_DATA['petits_cours']['REPLYTO'] @@ -259,7 +262,7 @@ def _traitement_post(request, demande): msg = mail.EmailMessage(mail_object, body, frommail, [user.email], [bccaddress], headers={'Reply-To': replyto}) mails_to_send.append(msg) - mails_to_send.append(mail.EmailMessage("Cours particuliers ENS", mainmail, + mails_to_send.append(mail.EmailMessage(mainmail_object, mainmail_body, frommail, [demande.email], [bccaddress], headers={'Reply-To': replyto}))