On inclue les invités dans la liste des machines

darcs-hash:20050421102338-d1718-8a41e75ebb5ef02032a4e2f2ca17c75e6c7dffd9.gz
This commit is contained in:
bernat 2005-04-21 12:23:38 +02:00
parent 12d160eff3
commit adf6f79c05

View file

@ -17,7 +17,7 @@ import sys, signal, os, commands, getopt, smtplib, shutil
sys.path.append('/usr/scripts/gestion') sys.path.append('/usr/scripts/gestion')
from ldap_crans import crans_ldap, crans, smtpserv, hostname from ldap_crans import crans_ldap, crans, smtpserv, hostname, invite
from lock import * from lock import *
from affich_tools import anim, cprint, OK, ERREUR, WARNING from affich_tools import anim, cprint, OK, ERREUR, WARNING
from time import localtime, strftime, time, sleep from time import localtime, strftime, time, sleep
@ -472,6 +472,8 @@ if inst :
cprint('Lecture base LDAP','gras') cprint('Lecture base LDAP','gras')
# Machines de l'assoce # Machines de l'assoce
machines = crans(db.conn).machines() machines = crans(db.conn).machines()
# Machines des invités
machines += invite(db.conn).machines()
# Machines des adhérents et clubs de l'année en cours # Machines des adhérents et clubs de l'année en cours
base = db.search('paiement=ok') base = db.search('paiement=ok')
base = base['adherent'] + base['club'] base = base['adherent'] + base['club']