La commande samba ne doit pas utilier l’OU spécifique
This commit is contained in:
@ -1,7 +1,7 @@
|
|||||||
diff --git usr/bin/importation_scribe usr/bin/importation_scribe
|
diff --git usr/bin/importation_scribe usr/bin/importation_scribe
|
||||||
index 0db4982..47f5c80 100755
|
index 0db4982..47f5c80 100755
|
||||||
--- usr/bin/importation_scribe
|
--- usrbin/importation_scribe
|
||||||
+++ usr/bin/importation_scribe
|
+++ usrbin/importation_scribe
|
||||||
@@ -42,21 +42,22 @@ choix de la source de données et imports
|
@@ -42,21 +42,22 @@ choix de la source de données et imports
|
||||||
- personnels administratifs
|
- personnels administratifs
|
||||||
- comptes invités
|
- comptes invités
|
||||||
@ -272,32 +272,9 @@ index 05569fd..c092698 100644
|
|||||||
|
|
||||||
def _get_ead_type(self, login):
|
def _get_ead_type(self, login):
|
||||||
diff --git usr/lib/python3/dist-packages/scribe/importation/writer.py usr/lib/python3/dist-packages/scribe/importation/writer.py
|
diff --git usr/lib/python3/dist-packages/scribe/importation/writer.py usr/lib/python3/dist-packages/scribe/importation/writer.py
|
||||||
index 34ce0fb..626143b 100644
|
index 34ce0fb..d4a2f27 100644
|
||||||
--- usr/lib/python3/dist-packages/scribe/importation/writer.py
|
--- usr/lib/python3/dist-packages/scribe/importation/writer.py
|
||||||
+++ usr/lib/python3/dist-packages/scribe/importation/writer.py
|
+++ usr/lib/python3/dist-packages/scribe/importation/writer.py
|
||||||
@@ -810,21 +810,21 @@ def _new_enseignant(enseignant, user, prefs, etab=None, new_passwords=[]):
|
|
||||||
'classe':classe,
|
|
||||||
'groups':groups,
|
|
||||||
'entlogin':False,
|
|
||||||
'disciplines':eval(enseignant.disciplines),
|
|
||||||
'entpersonjointure':str(enseignant.entpersonjointure),
|
|
||||||
# préférences générales
|
|
||||||
'quota':prefs.get_default('quota'),
|
|
||||||
'profil':prefs.get_default('profil'),
|
|
||||||
'shell':prefs.get_default('shell') == 'oui',
|
|
||||||
'change_pwd':prefs.get_default('change_pwd') == 'oui' if FORCED_PASSWORD_MODIFICATION_ALLOWED else False,
|
|
||||||
- 'etab': etab,
|
|
||||||
+ 'etab': etab if etab is None else '00000000',
|
|
||||||
'syncpassword': not EOLE_AD,
|
|
||||||
}
|
|
||||||
# création de l'enseignant
|
|
||||||
user._add(**my_enseignant)
|
|
||||||
info = "%(nom)s;%(prenom)s;%(login)s;%(password)s"
|
|
||||||
log.write_info(info % my_enseignant, config.ENS_INFO)
|
|
||||||
if EOLE_AD:
|
|
||||||
new_passwords.append((login, password))
|
|
||||||
return login
|
|
||||||
|
|
||||||
@@ -832,25 +832,26 @@ def _maj_enseignant(enseignant, user, login, etab, administratif=False):
|
@@ -832,25 +832,26 @@ def _maj_enseignant(enseignant, user, login, etab, administratif=False):
|
||||||
"""
|
"""
|
||||||
traitement d'un enseignant existant (mise à jour)
|
traitement d'un enseignant existant (mise à jour)
|
||||||
|
Reference in New Issue
Block a user