Plus de ségrégation
This commit is contained in:
@ -1,5 +1,5 @@
|
|||||||
diff --git usr/bin/importation_scribe usr/bin/importation_scribe
|
diff --git usr/bin/importation_scribe usr/bin/importation_scribe
|
||||||
index 0db4982..4b84c5f 100755
|
index 0db4982..47f5c80 100755
|
||||||
--- usr/bin/importation_scribe
|
--- usr/bin/importation_scribe
|
||||||
+++ usr/bin/importation_scribe
|
+++ usr/bin/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
|
||||||
@ -15,7 +15,7 @@ index 0db4982..4b84c5f 100755
|
|||||||
from scribe.eoleldap import Ldap
|
from scribe.eoleldap import Ldap
|
||||||
-from scribe.ldapconf import SUPPORT_ETAB
|
-from scribe.ldapconf import SUPPORT_ETAB
|
||||||
+from scribe.eoleuser import User
|
+from scribe.eoleuser import User
|
||||||
+from scribe.ldapconf import SUPPORT_ETAB, BRANCHE_ETAB, PROF_FILTER
|
+from scribe.ldapconf import SUPPORT_ETAB, PROF_FILTER
|
||||||
from scribe.eoletools import nscd_start, nscd_stop
|
from scribe.eoletools import nscd_start, nscd_stop
|
||||||
from scribe.parsing import sconet, aaf, be1d, scribecsv2
|
from scribe.parsing import sconet, aaf, be1d, scribecsv2
|
||||||
from scribe.importation import preferences, writer, config
|
from scribe.importation import preferences, writer, config
|
||||||
@ -26,7 +26,7 @@ index 0db4982..4b84c5f 100755
|
|||||||
|
|
||||||
class OutOfRange(Exception):
|
class OutOfRange(Exception):
|
||||||
""" Exception OutOfRange """
|
""" Exception OutOfRange """
|
||||||
@@ -458,33 +459,45 @@ class Console:
|
@@ -458,33 +459,44 @@ class Console:
|
||||||
"""
|
"""
|
||||||
log.add_lock()
|
log.add_lock()
|
||||||
log.debuglog("Arrêt de LSC...", title=True)
|
log.debuglog("Arrêt de LSC...", title=True)
|
||||||
@ -37,9 +37,8 @@ index 0db4982..4b84c5f 100755
|
|||||||
prefs = preferences.get_enseignants_prefs()
|
prefs = preferences.get_enseignants_prefs()
|
||||||
etab = prefs.get_default('etab')
|
etab = prefs.get_default('etab')
|
||||||
etab_prefix = prefs.get_default('etab_prefix')
|
etab_prefix = prefs.get_default('etab_prefix')
|
||||||
+ branche_etab = BRANCHE_ETAB % {'etab': etab}
|
|
||||||
+ purge_option = 'keep'
|
+ purge_option = 'keep'
|
||||||
+ old_logins = connexion._search('(&{})'.format(PROF_FILTER), 'uid', suffix=branche_etab)
|
+ old_logins = connexion._search('(&{})'.format(PROF_FILTER), 'uid')
|
||||||
+
|
+
|
||||||
else:
|
else:
|
||||||
etab = None
|
etab = None
|
||||||
|
Reference in New Issue
Block a user