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

Commentaires dans CPS, à étoffer un peu. Et léger typofix.

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-03-04 00:01:10 +01:00
parent 890a1067fc
commit ef07bc5a28
2 changed files with 116 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gestion/dialog/adherent.py
View file

@ -723,19 +723,19 @@ class Dialog(proprio.Dialog):
def set_chambre(adherent, chbre):
try:
adherent['postalAddress'] = []
adherent['chbre'] = unicode(output, 'utf-8')
adherent['chbre'] = unicode(chbre, 'utf-8')
except UniquenessError:
if expulse_squatteur(adherent, chbre):
# La chambre est maintenant normalement libre
adherent['chbre'] = unicode(output, 'utf-8')
adherent['chbre'] = unicode(chbre, 'utf-8')
else:
raise Continue(self_cont)
return adherent
def todo(chbre, adherent, self_cont, success_cont):
if not output:
if not chbre:
raise Continue(self_cont)
if output == "????":
if chbre == "????":
raise ValueError("Chambre ???? invalide")
if create:
return set_chambre(adherent, chbre)
@ -745,7 +745,7 @@ class Dialog(proprio.Dialog):
adherent.validate_changes()
adherent.history_gen()
adherent.save()
self.display_item(item=adherent, title="Adhérent déménagé dans la chambre %s" % output)
self.display_item(item=adherent, title="Adhérent déménagé dans la chambre %s" % chbre)
raise Continue(success_cont(adherent=adherent))
(code, output) = self.handle_dialog(cont, box)