Ne lister que les utilisateurs de l’établissement en vue de la suppression
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git usr/bin/importation_scribe usr/bin/importation_scribe
|
||||
index 0db4982..47f5c80 100755
|
||||
index 0db4982..01ee9a1 100755
|
||||
--- usr/bin/importation_scribe
|
||||
+++ usr/bin/importation_scribe
|
||||
@@ -42,21 +42,22 @@ choix de la source de données et imports
|
||||
@ -15,7 +15,7 @@ index 0db4982..47f5c80 100755
|
||||
from scribe.eoleldap import Ldap
|
||||
-from scribe.ldapconf import SUPPORT_ETAB
|
||||
+from scribe.eoleuser import User
|
||||
+from scribe.ldapconf import SUPPORT_ETAB, PROF_FILTER
|
||||
+from scribe.ldapconf import SUPPORT_ETAB, PROF_FILTER, BRANCHE_ETAB
|
||||
from scribe.eoletools import nscd_start, nscd_stop
|
||||
from scribe.parsing import sconet, aaf, be1d, scribecsv2
|
||||
from scribe.importation import preferences, writer, config
|
||||
@ -26,7 +26,7 @@ index 0db4982..47f5c80 100755
|
||||
|
||||
class OutOfRange(Exception):
|
||||
""" Exception OutOfRange """
|
||||
@@ -458,33 +459,44 @@ class Console:
|
||||
@@ -458,33 +459,45 @@ class Console:
|
||||
"""
|
||||
log.add_lock()
|
||||
log.debuglog("Arrêt de LSC...", title=True)
|
||||
@ -38,7 +38,8 @@ index 0db4982..47f5c80 100755
|
||||
etab = prefs.get_default('etab')
|
||||
etab_prefix = prefs.get_default('etab_prefix')
|
||||
+ purge_option = 'keep'
|
||||
+ old_logins = connexion._search('(&{})'.format(PROF_FILTER), 'uid')
|
||||
+ suffix=BRANCHE_ETAB % {'etab': etab}
|
||||
+ old_logins = connexion._search('(&{})'.format(PROF_FILTER), 'uid', suffix=suffix)
|
||||
+
|
||||
else:
|
||||
etab = None
|
||||
@ -57,11 +58,11 @@ index 0db4982..47f5c80 100755
|
||||
+ if SUPPORT_ETAB:
|
||||
+ user = User()
|
||||
+ user.ldap_admin = connexion
|
||||
+ obsolete_logins = [login[1]['uid'] for login in old_logins if login[1]['uid'] not in logins]
|
||||
+ obsolete_logins = [login[1]['uid'][0] for login in old_logins if login[1]['uid'] not in logins]
|
||||
+ for obsolete_login in obsolete_logins:
|
||||
+ # eoleusers from dns and eoleuser._quit_etab
|
||||
+ user._quit_etab(obsolete_login, etab=etab)
|
||||
+ print(obsolete_logins)
|
||||
+ print(obsolete_login)
|
||||
+ #user._quit_etab(obsolete_login, etab=etab)
|
||||
if self.data_type in ['sconet', 'aaf']:
|
||||
writer.write_service(store=self.store, connexion=connexion,
|
||||
etab=etab, etab_prefix=etab_prefix)
|
||||
|
Reference in New Issue
Block a user