Première version
This commit is contained in:
39
patches.d/scribe-backend.patch
Normal file
39
patches.d/scribe-backend.patch
Normal file
@ -0,0 +1,39 @@
|
||||
diff --git usr/lib/python3/dist-packages/scribe/importation/writer.py usr/lib/python3/dist-packages/scribe/importation/writer.py
|
||||
index 34ce0fb..e4ddfea 100644
|
||||
--- usr/lib/python3/dist-packages/scribe/importation/writer.py
|
||||
+++ usr/lib/python3/dist-packages/scribe/importation/writer.py
|
||||
@@ -900,10 +900,10 @@ def write_enseignant(store, connexion, etab=None, current_ead_user=config.DEFAUL
|
||||
else:
|
||||
login = ''
|
||||
else:
|
||||
- login = _enseignant_exists(enseignant, user)
|
||||
+ login = _enseignant_exists(enseignant, user, etab=etab)
|
||||
if login != '':
|
||||
# enseignant existant
|
||||
- _maj_enseignant(enseignant, user, login, etab)
|
||||
+ _maj_enseignant(enseignant, user, login, etab=etab)
|
||||
else:
|
||||
# nouvel enseignant
|
||||
if str(enseignant.nom) == '' or str(enseignant.prenom) == '':
|
||||
@@ -1027,7 +1027,7 @@ def write_administratif(store, connexion, etab=None, current_ead_user=config.DEF
|
||||
# personnel existe
|
||||
_maj_administratif(administratif, user, login)
|
||||
else:
|
||||
- login = _enseignant_exists(administratif, user)
|
||||
+ login = _enseignant_exists(administratif, user, etab)
|
||||
if login != '':
|
||||
# le personnel a été crée comme un professeur...
|
||||
log.infolog("(%s a un compte enseignant)" % login)
|
||||
diff --git usr/lib/python3/dist-packages/scribe/linker.py usr/lib/python3/dist-packages/scribe/linker.py
|
||||
index 71fb28d..09af637 100644
|
||||
--- usr/lib/python3/dist-packages/scribe/linker.py
|
||||
+++ usr/lib/python3/dist-packages/scribe/linker.py
|
||||
@@ -99,7 +99,7 @@ def _responsable_exists(responsable, user):
|
||||
return res['uid'][0]
|
||||
return ''
|
||||
|
||||
-def _enseignant_exists(enseignant, user):
|
||||
+def _enseignant_exists(enseignant, user, etab=None):
|
||||
"""
|
||||
recherche si un enseignant existe déjà dans l'annuaire
|
||||
enseignant : storage.Enseignant()
|
Reference in New Issue
Block a user