lyanis/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Actions Packages Activity

Merge branch 'master' of https://scodoc.org/git/ScoDoc/ScoDoc into api

Browse Source
This commit is contained in:
leonard_montalbano 2022-02-24 14:10:53 +01:00
commit 35be7ebb4c
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scodoc/sco_bulletins.py
View File

@ -1013,11 +1013,16 @@ def mail_bulletin(formsemestre_id, I, pdfdata, filename, recipient_addr):
intro_mail = sco_preferences.get_preference("bul_intro_mail", formsemestre_id) intro_mail = sco_preferences.get_preference("bul_intro_mail", formsemestre_id)
if intro_mail: if intro_mail:
try:
hea = intro_mail % { hea = intro_mail % {
"nomprenom": etud["nomprenom"], "nomprenom": etud["nomprenom"],
"dept": dept, "dept": dept,
"webmaster": webmaster, "webmaster": webmaster,
} }
except KeyError as e:
raise ScoValueError(
"format 'Message d'accompagnement' (bul_intro_mail) invalide, revoir les réglages dans les préférences"
)
else: else:
hea = "" hea = ""

8
app/scodoc/sco_synchro_etuds.py
View File

@ -854,9 +854,13 @@ def formsemestre_import_etud_admission(
apo_emailperso = etud.get("mailperso", "") apo_emailperso = etud.get("mailperso", "")
if info["emailperso"] and not apo_emailperso: if info["emailperso"] and not apo_emailperso:
apo_emailperso = info["emailperso"] apo_emailperso = info["emailperso"]
if import_email:
if not "mail" in etud:
raise ScoValueError(
"la réponse portail n'a pas le champs requis 'mail'"
)
if ( if (
import_email info["email"] != etud["mail"]
and info["email"] != etud["mail"]
or info["emailperso"] != apo_emailperso or info["emailperso"] != apo_emailperso
): ):
sco_etud.adresse_edit( sco_etud.adresse_edit(