Morpheus/gestioCOF
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Merge branch 'Kerl/settings_syntax' into 'master'

Browse source 
Meilleure gestion des données mails

Les valeurs de champs FROM, REPLY-TO et BCC des mails envoyés par
GestioCOF sont enregistrées dans un dictionnaire `settings.MAIL_DATA`
plutôt que d'être toutes enregistrées comme variables indépendantes.

See merge request !88
This commit is contained in:
Martin Pepin 2016-10-04 12:10:40 +02:00
commit fbc4158de7
3 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bda/models.py
View file

@ -123,8 +123,9 @@ class Spectacle(models.Model):
'show': self}) 'show': self})
mail_tot = mail.EmailMessage( mail_tot = mail.EmailMessage(
mail_object, mail_body, mail_object, mail_body,
settings.RAPPEL_FROM, [member[2]], settings.MAIL_DATA['rappels']['FROM'], [member[2]],
[], headers={'Reply-To': settings.RAPPEL_REPLY_TO}) [], headers={
'Reply-To': settings.MAIL_DATA['rappels']['REPLYTO']})
mails_to_send.append(mail_tot) mails_to_send.append(mail_tot)
# On envoie les mails # On envoie les mails
connection = mail.get_connection() connection = mail.get_connection()
@ -283,8 +284,10 @@ class SpectacleRevente(models.Model):
'domain': Site.objects.get_current().domain}) 'domain': Site.objects.get_current().domain})
mail_tot = mail.EmailMessage( mail_tot = mail.EmailMessage(
mail_object, mail_body, mail_object, mail_body,
settings.REVENTE_FROM, [participant.user.email], settings.MAIL_DATA['revente']['FROM'],
[], headers={'Reply-To': settings.REVENTE_REPLY_TO}) [participant.user.email],
[], headers={
'Reply-To': settings.MAIL_DATA['revente']['REPLYTO']})
mails_to_send.append(mail_tot) mails_to_send.append(mail_tot)
connection = mail.get_connection() connection = mail.get_connection()
@ -305,8 +308,10 @@ class SpectacleRevente(models.Model):
'mail': self.attribution.participant.user.email}) 'mail': self.attribution.participant.user.email})
mail_tot = mail.EmailMessage( mail_tot = mail.EmailMessage(
mail_object, mail_body, mail_object, mail_body,
settings.REVENTE_FROM, [participant.user.email], settings.MAIL_DATA['revente']['FROM'],
[], headers={'Reply-To': settings.REVENTE_REPLY_TO}) [participant.user.email],
[], headers={
'Reply-To': settings.MAIL_DATA['revente']['REPLYTO']})
mails_to_send.append(mail_tot) mails_to_send.append(mail_tot)
connection = mail.get_connection() connection = mail.get_connection()

21
cof/settings_dev.py
View file

@ -145,15 +145,18 @@ ADMIN_MEDIA_PREFIX = '/static/grappelli/'
GRAPPELLI_ADMIN_HEADLINE = "GestioCOF" GRAPPELLI_ADMIN_HEADLINE = "GestioCOF"
GRAPPELLI_ADMIN_TITLE = "<a href=\"/\">GestioCOF</a>" GRAPPELLI_ADMIN_TITLE = "<a href=\"/\">GestioCOF</a>"
PETITS_COURS_FROM = "Le COF <cof@ens.fr>" MAIL_DATA = {
PETITS_COURS_BCC = "archivescof@gmail.com" 'petits_cours': {
PETITS_COURS_REPLYTO = "cof@ens.fr" 'FROM': "Le COF <cof@ens.fr>",
'BCC': "archivescof@gmail.com",
RAPPEL_FROM = 'Le BdA <bda@ens.fr>' 'REPLYTO': "cof@ens.fr"},
RAPPEL_REPLY_TO = RAPPEL_FROM 'rappels': {
'FROM': 'Le BdA <bda@ens.fr>',
REVENTE_FROM = 'BdA-Revente <bda-revente@ens.fr>' 'REPLYTO': 'Le BdA <bda@ens.fr>'},
REVENTE_REPLY_TO = REVENTE_FROM 'revente': {
'FROM': 'BdA-Revente <bda-revente@ens.fr>',
'REPLYTO': 'BdA-Revente <bda-revente@ens.fr>'},
}
LOGIN_URL = "/gestion/login" LOGIN_URL = "/gestion/login"
LOGIN_REDIRECT_URL = "/gestion/" LOGIN_REDIRECT_URL = "/gestion/"

6
gestioncof/petits_cours_views.py
View file

@ -282,9 +282,9 @@ def _traitement_post(request, demande):
{"proposals": proposals_list, {"proposals": proposals_list,
"unsatisfied": unsatisfied, "unsatisfied": unsatisfied,
"extra": extra}) "extra": extra})
frommail = settings.PETITS_COURS_FROM frommail = settings.MAIL_DATA['petits_cours']['FROM']
bccaddress = settings.PETITS_COURS_BCC bccaddress = settings.MAIL_DATA['petits_cours']['BCC']
replyto = settings.PETITS_COURS_REPLYTO replyto = settings.MAIL_DATA['petits_cours']['REPLYTO']
mails_to_send = [] mails_to_send = []
for (user, msg) in proposed_mails: for (user, msg) in proposed_mails:
msg = EmailMessage("Petits cours ENS par le COF", msg, msg = EmailMessage("Petits cours ENS par le COF", msg,