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

Mnage dans l'intranet

Browse source 
darcs-hash:20081006060625-ffbb2-6d2a621ace92b0fa82b3963650d7096fcbdb3974.gz
This commit is contained in:
Nicolas Dandrimont 2008-10-06 08:06:25 +02:00
parent 7cc9a25757
commit bcad68a7dd
4 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
intranet/ClassesIntranet/Intranet.py
View file

@ -202,10 +202,6 @@ Ceci est un rapport de bug envoye par l'intranet.
testErreur.exposed = True testErreur.exposed = True
def test(self):
return cherrypy.request.remote_addr
test.exposed = True
def _cp_on_http_error(self, status, message): def _cp_on_http_error(self, status, message):
if cherrypy.config.configMap["global"]["server.environment"] == "development": if cherrypy.config.configMap["global"]["server.environment"] == "development":
cherrypy._cputil._cp_on_http_error(status, message) cherrypy._cputil._cp_on_http_error(status, message)

4
intranet/conf/dev.cfg
View file

@ -12,7 +12,7 @@ server.logTracebacks=True
server.reverseDNS=False server.reverseDNS=False
server.threadPool=10 server.threadPool=10
server.environment="development" server.environment="development"
server.log_config_options= True server.log_config_options=False
logDebugInfoFilter.on = False logDebugInfoFilter.on = False
@ -20,8 +20,6 @@ logDebugInfoFilter.on = False
paypal.businessAdress = "gdetrez-buisness@crans.org" paypal.businessAdress = "gdetrez-buisness@crans.org"
paypal.useSandbox = True paypal.useSandbox = True
crans.modules.dir = "modules"
# #
[/test] [/test]
crans.droits = "Nounous" crans.droits = "Nounous"

2
intranet/conf/prod.cfg
View file

@ -3,7 +3,7 @@
server.socketPort=8080 server.socketPort=8080
server.socketHost="" server.socketHost=""
server.socketFile="" server.socketFile=""
server.socketQueueSize=10 server.socketQueueSize=5
server.protocolVersion="HTTP/1.0" server.protocolVersion="HTTP/1.0"
server.logToScreen=False server.logToScreen=False
server.logFile="/var/log/crans/intranet.log" server.logFile="/var/log/crans/intranet.log"

15
intranet/modules/quota/main.py
View file

@ -1,9 +1,9 @@
#! /usr/bin/env python #! /usr/bin/env python
import cherrypy, tempfile, shutil, os import cherrypy, tempfile, shutil, os
import crans.utils.quota
import crans.cp import crans.cp
from ClassesIntranet.ModuleBase import ModuleBase from ClassesIntranet.ModuleBase import ModuleBase
import crans.utils.quota as quota
class main(ModuleBase): class main(ModuleBase):
def category(self): def category(self):
@ -18,8 +18,12 @@ class main(ModuleBase):
return "icon.png" return "icon.png"
def _get_quota(self): def _get_quota(self):
return crans.utils.quota.getUserQuota(cherrypy.session['uid']) if (cherrypy.config.configMap["global"]["server.environment"] == "development"):
#return [{'%': 33.9, 'quota': 390.62, 'label': u'Dossier personnel', 'limite': 585.94, 'filesystem': '/home', 'usage': 420.32}, {'%': 0.1, 'quota': 100.00, 'label': u'Boite de r\xe9ception', 'limite': 150.00, 'filesystem': '/var/mail', 'usage': 0.06}] return quota.fake_getUserQuota(cherrypy.session['uid'])
else:
return quota.getUserQuota(cherrypy.session['uid'])
########################## ##########################
# affichage # affichage
@ -28,7 +32,6 @@ class main(ModuleBase):
# methode qui affiche la template # methode qui affiche la template
# #
def index(self ): def index(self ):
#return "youpiiii"
values = {} values = {}
try: try:
quotas = self._get_quota() quotas = self._get_quota()
@ -60,7 +63,7 @@ class main(ModuleBase):
"svg_url":"barreSVG?filesystem=%s" % a_quota['filesystem'], "svg_url":"barreSVG?filesystem=%s" % a_quota['filesystem'],
} }
returned_quotas.append(a_returned_quota) returned_quotas.append(a_returned_quota)
values = {'quotas': returned_quotas, 'e': "eeede"} values = {'quotas': returned_quotas}
except Exception, e: except Exception, e:
crans.cp.log('error getting quota for user %s : %s' % (cherrypy.session['uid'], str(e)), 'QUOTA', 1) crans.cp.log('error getting quota for user %s : %s' % (cherrypy.session['uid'], str(e)), 'QUOTA', 1)
values = {'erreur':str(e)} values = {'erreur':str(e)}