From b09061b9dc94397e94502dc719a4655d3c480bee Mon Sep 17 00:00:00 2001 From: gdetrez Date: Tue, 19 Dec 2006 02:14:40 +0100 Subject: [PATCH] encore un p'tit message darcs-hash:20061219011440-f46e9-5e629710f0872fdbb8f4ed344e13a1e53aa4109a.gz --- intranet/conf/intranet.cfg | 1 + intranet/pages/impression.py | 2 ++ intranet/templates/impression.tmpl | 8 ++++++++ 3 files changed, 11 insertions(+) diff --git a/intranet/conf/intranet.cfg b/intranet/conf/intranet.cfg index aa7b8599..4f042114 100644 --- a/intranet/conf/intranet.cfg +++ b/intranet/conf/intranet.cfg @@ -21,6 +21,7 @@ crans.droits="Imprimeur" [/impression] crans.activate = False +crans.activate.errorMsg = u"Plus d'encre !" [/static] sessionAuthenticateFilter.on=False diff --git a/intranet/pages/impression.py b/intranet/pages/impression.py index dcb10a8b..6c97837f 100755 --- a/intranet/pages/impression.py +++ b/intranet/pages/impression.py @@ -64,8 +64,10 @@ class root: crans.impression.etat_imprimante.etat() except Exception, e: data['Erreur_imprimante'] = str(e).replace("\"", "\\\"") + data['errorMsg'] = u"Imprimante injoignable" if not cherrypy.config.get('crans.activate', True): data['Erreur_imprimante'] = "Config impression" + data['errorMsg'] = cherrypy.config.get('crans.activate.errorMsg', u"Imprimante HS") return {'template':'impression', 'values':data, 'stylesheets':['impression.css'], diff --git a/intranet/templates/impression.tmpl b/intranet/templates/impression.tmpl index 3cf577aa..1f5b7e00 100644 --- a/intranet/templates/impression.tmpl +++ b/intranet/templates/impression.tmpl @@ -1,5 +1,13 @@ #import crans.impression +#if $getVar('errorMsg',False) + +#end if +
Options d'impression