crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctifs sur le précédent commit, et prise en compte dans mkhome.

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-02-18 20:43:10 +01:00
parent 962d9df0f3
commit da71e80be1
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gestion/gen_confs/adherents.py
View file

@ -117,7 +117,7 @@ class home:
try: try:
login, oldLogin, oldHome = args.split(",") login, oldLogin, oldHome = args.split(",")
if login: if login:
adh = CONN.search("uid=%s" % (uid,))['adherent'][0] adh = CONN.search("login=%s" % (login,))['adherent'][0]
home = adh.home() home = adh.home()
uid = adh.uidNumber() uid = adh.uidNumber()
mail_redirect = adh.email_exterieur() mail_redirect = adh.email_exterieur()

4
gestion/gest_crans.py
View file

@ -457,6 +457,8 @@ def set_mail_ext(adher):
if not adher.compte(): if not adher.compte():
return 0 return 0
cur = adher.email_exterieur()
if u'Nounou' in adher.droits() and not isadm: if u'Nounou' in adher.droits() and not isadm:
arg = u'--title "Adresse mail extérieure de %s" ' % adher.Nom() arg = u'--title "Adresse mail extérieure de %s" ' % adher.Nom()
arg += u'--msgbox "Vous n\'avez pas les droits necessaires pour effectuer cette opération.\n\n\n" 0 0' arg += u'--msgbox "Vous n\'avez pas les droits necessaires pour effectuer cette opération.\n\n\n" 0 0'
@ -477,7 +479,7 @@ def set_mail_ext(adher):
return 0 return 0
arg = u'--title "Adresse mail extérieure pour %s" ' % adher.Nom() arg = u'--title "Adresse mail extérieure pour %s" ' % adher.Nom()
arg += u'--inputbox "Adresse : " 0 0 "%s"' % default arg += u'--inputbox "Adresse : " 0 0 "%s"' % (cur,)
annul, result = dialog(arg) annul, result = dialog(arg)
if annul: if annul:
return 1 return 1

2
gestion/tools/mkhome.py
View file

@ -24,7 +24,7 @@ l=[]
for user in sys.argv[1:]: for user in sys.argv[1:]:
a=conn.search(u'uid=%s' % user) a=conn.search(u'uid=%s' % user)
if a and a[0]['homeDirectory'] and a[0]['uidNumber'] and a[0]['uid']: if a and a[0]['homeDirectory'] and a[0]['uidNumber'] and a[0]['uid']:
l.append("%s,%s,%s" % (a[0]['homeDirectory'][0], a[0]['uidNumber'][0], a[0]['uid'][0])) l.append("%s,," % (a[0]['uid'][0],))
if l: if l:
h=gestion.gen_confs.adherents.home(l) h=gestion.gen_confs.adherents.home(l)