[intranet] correction de bug + autorisation d'imprimer pour les imprimeurs
darcs-hash:20090520174735-bd074-bdc8ce6b6715e6c8c604461078e4d0e17520714f.gz
This commit is contained in:
parent
ea8476a765
commit
0e46822c30
1 changed files with 2 additions and 2 deletions
|
@ -24,7 +24,7 @@
|
||||||
# Copyright (c) 2006, 2007, 2008, 2009 by Cr@ns (http://www.crans.org)
|
# Copyright (c) 2006, 2007, 2008, 2009 by Cr@ns (http://www.crans.org)
|
||||||
# #############################################################
|
# #############################################################
|
||||||
|
|
||||||
import cherrypy, tempfile, shutil, os, commands, sys
|
import cherrypy, tempfile, shutil, os, commands, sys, re
|
||||||
import crans.cp
|
import crans.cp
|
||||||
|
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
|
@ -98,7 +98,7 @@ class main(ModuleBase):
|
||||||
data['Erreur_imprimante'] = str(e).replace("\"", "\\\"")
|
data['Erreur_imprimante'] = str(e).replace("\"", "\\\"")
|
||||||
data['errorMsg'] = u"Imprimante injoignable"
|
data['errorMsg'] = u"Imprimante injoignable"
|
||||||
adh = cherrypy.session['LDAP'].getProprio(cherrypy.session['uid'])
|
adh = cherrypy.session['LDAP'].getProprio(cherrypy.session['uid'])
|
||||||
if not ("Bureau" in adh.droits() or "Nounou" in adh.droits()):
|
if not ("Bureau" in adh.droits() or "Nounou" in adh.droits() or 'Imprimeur' in adh.droits()):
|
||||||
data['Erreur_imprimante'] = u"Imprimante non encore mise à disposition"
|
data['Erreur_imprimante'] = u"Imprimante non encore mise à disposition"
|
||||||
data['errorMsg'] = u"La nouvelle imprimante est encore en cours d'installation"
|
data['errorMsg'] = u"La nouvelle imprimante est encore en cours d'installation"
|
||||||
if not cherrypy.config.get('crans.activate', True):
|
if not cherrypy.config.get('crans.activate', True):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue