Compléter la désinscription à un établissement
This commit is contained in:
@ -234,10 +234,10 @@ index 45ec338..9a67c6d 100644
|
|||||||
res = self.ldap_admin._search("(&%s%s)" % (USER_FILTER, filtre), attrs)
|
res = self.ldap_admin._search("(&%s%s)" % (USER_FILTER, filtre), attrs)
|
||||||
for user in res:
|
for user in res:
|
||||||
diff --git usr/lib/python3/dist-packages/scribe/eoleuser.py usr/lib/python3/dist-packages/scribe/eoleuser.py
|
diff --git usr/lib/python3/dist-packages/scribe/eoleuser.py usr/lib/python3/dist-packages/scribe/eoleuser.py
|
||||||
index 05569fd..c092698 100644
|
index 05569fd..fb4757f 100644
|
||||||
--- usr/lib/python3/dist-packages/scribe/eoleuser.py
|
--- usr/lib/python3/dist-packages/scribe/eoleuser.py
|
||||||
+++ usr/lib/python3/dist-packages/scribe/eoleuser.py
|
+++ usr/lib/python3/dist-packages/scribe/eoleuser.py
|
||||||
@@ -410,20 +410,25 @@ class User(LdapEntry):
|
@@ -410,20 +410,26 @@ class User(LdapEntry):
|
||||||
grp = Group()
|
grp = Group()
|
||||||
grp.ldap_admin = self.ldap_admin
|
grp.ldap_admin = self.ldap_admin
|
||||||
if touch:
|
if touch:
|
||||||
@ -252,6 +252,7 @@ index 05569fd..c092698 100644
|
|||||||
+ self._desinscription(user, etab, sync=False)
|
+ self._desinscription(user, etab, sync=False)
|
||||||
+ for grp in self._get_user_groups(user, etab):
|
+ for grp in self._get_user_groups(user, etab):
|
||||||
+ self._desinscription(user, grp, sync=False)
|
+ self._desinscription(user, grp, sync=False)
|
||||||
|
+ self._desinscription(user, etab, sync=False)
|
||||||
+
|
+
|
||||||
def _gen_ftpdir(self, login):
|
def _gen_ftpdir(self, login):
|
||||||
"""
|
"""
|
||||||
@ -263,7 +264,7 @@ index 05569fd..c092698 100644
|
|||||||
rmtree(ftpdir)
|
rmtree(ftpdir)
|
||||||
makedirs(ftpdir, 0o500)
|
makedirs(ftpdir, 0o500)
|
||||||
system('/bin/chown %s %s' % (login, ftpdir))
|
system('/bin/chown %s %s' % (login, ftpdir))
|
||||||
@@ -594,27 +599,27 @@ class User(LdapEntry):
|
@@ -594,27 +600,27 @@ class User(LdapEntry):
|
||||||
authldap = Ldap(binddn=user_dn,
|
authldap = Ldap(binddn=user_dn,
|
||||||
passwd=password)
|
passwd=password)
|
||||||
try:
|
try:
|
||||||
|
Reference in New Issue
Block a user