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

On vire l'info de brassage qui est directement dans prise_etat

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-04-25 18:03:54 +02:00
parent 2711dd12d7
commit 43c7ab0514
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
printing/templates/proprio
View file

@ -10,9 +10,6 @@
{{"Mail de secours : "|coul('gras')}}{{o.mailExt|join(', ')}} {{"Mail de secours : "|coul('gras')}}{{o.mailExt|join(', ')}}
{% endif %} {% endif %}
{% block proprio %}{% endblock %} {% block proprio %}{% endblock %}
{% if brassage %}
{{"Brassage : "|coul('gras')}}{{brassage}}
{% endif %}
{% include 'blacklists' %} {% include 'blacklists' %}
{{machines}} {{machines}}

5
printing/templates/templates.py
View file

@ -33,9 +33,10 @@ def try_import(lib):
lib = None lib = None
return lib return lib
def prise_etat(chbre): def prise_etat(chbre):
"""Récupère l'état d'une prise""" """Récupère l'état d'une prise"""
if chbre in ["????", "EXT"]:
return style(u"Aucune adresse connue", "violet")
bat = chbre[0].lower() bat = chbre[0].lower()
chbre = chbre[1:] chbre = chbre[1:]
prise = gestion.annuaires_pg.chbre_prises(batiment=bat, chambre=chbre) prise = gestion.annuaires_pg.chbre_prises(batiment=bat, chambre=chbre)
@ -277,8 +278,6 @@ def proprio(proprio, params):
cetud = style(u"Pas de carte d'étudiant") cetud = style(u"Pas de carte d'étudiant")
params["cetud"] = cetud params["cetud"] = cetud
params['etat_administratif']=etat_administratif params['etat_administratif']=etat_administratif
if proprio["chbre"][0].value not in ["????", "EXT"]:
params['brassage'] = style("Cr@ns", "bleu")# if gestion.annuaires_pg.is_crans(proprio["chbre"][0].value[0], proprio["chbre"][0].value[1:]) else style("CROUS", "jaune")
try: try:
if proprio.machines(): if proprio.machines():