diff --git a/intranet/conf/intranet.cfg b/intranet/conf/intranet.cfg index 2468afff..aa7b8599 100644 --- a/intranet/conf/intranet.cfg +++ b/intranet/conf/intranet.cfg @@ -19,6 +19,9 @@ crans.droits="Imprimeur" [/gestionFactures] crans.droits="Imprimeur" +[/impression] +crans.activate = False + [/static] sessionAuthenticateFilter.on=False sessionFilter.on = False diff --git a/intranet/pages/impression.py b/intranet/pages/impression.py index bd5c8c2e..dcb10a8b 100755 --- a/intranet/pages/impression.py +++ b/intranet/pages/impression.py @@ -61,10 +61,11 @@ class root: data['fileList'] = self.getUploadedFileListFor(cherrypy.session['uid']) try: - data['etatImprimante'] = "
".join(crans.impression.etat_imprimante.etat()) + crans.impression.etat_imprimante.etat() except Exception, e: - data['etatImprimante'] = 'Imprimante hors ligne' data['Erreur_imprimante'] = str(e).replace("\"", "\\\"") + if not cherrypy.config.get('crans.activate', True): + data['Erreur_imprimante'] = "Config impression" return {'template':'impression', 'values':data, 'stylesheets':['impression.css'], @@ -160,6 +161,8 @@ class root: # methode pour recuperer l'etat de l'imprimante # def etatImprimante(self): + if not cherrypy.config.get('crans.activate', True): + return {"printer_state" : u"Système down"} try: return {"printer_state" : u"\\n".join(crans.impression.etat_imprimante.etat())} except Exception, e: diff --git a/intranet/templates/impression.tmpl b/intranet/templates/impression.tmpl index baec1744..3cf577aa 100644 --- a/intranet/templates/impression.tmpl +++ b/intranet/templates/impression.tmpl @@ -80,8 +80,13 @@
  • État imprimante:
    - $etatImprimante + -
  • + #if not $getVar('Erreur_imprimante',False)