diff --git a/intranet/ClassesIntranet/Intranet.py b/intranet/ClassesIntranet/Intranet.py index 2d40c124..14e08225 100755 --- a/intranet/ClassesIntranet/Intranet.py +++ b/intranet/ClassesIntranet/Intranet.py @@ -202,10 +202,6 @@ Ceci est un rapport de bug envoye par l'intranet. testErreur.exposed = True - def test(self): - return cherrypy.request.remote_addr - test.exposed = True - def _cp_on_http_error(self, status, message): if cherrypy.config.configMap["global"]["server.environment"] == "development": cherrypy._cputil._cp_on_http_error(status, message) diff --git a/intranet/conf/dev.cfg b/intranet/conf/dev.cfg index 0300d794..e7737d18 100644 --- a/intranet/conf/dev.cfg +++ b/intranet/conf/dev.cfg @@ -12,7 +12,7 @@ server.logTracebacks=True server.reverseDNS=False server.threadPool=10 server.environment="development" -server.log_config_options= True +server.log_config_options=False logDebugInfoFilter.on = False @@ -20,8 +20,6 @@ logDebugInfoFilter.on = False paypal.businessAdress = "gdetrez-buisness@crans.org" paypal.useSandbox = True -crans.modules.dir = "modules" - # [/test] crans.droits = "Nounous" diff --git a/intranet/conf/prod.cfg b/intranet/conf/prod.cfg index 0d978df2..052c976f 100644 --- a/intranet/conf/prod.cfg +++ b/intranet/conf/prod.cfg @@ -3,7 +3,7 @@ server.socketPort=8080 server.socketHost="" server.socketFile="" -server.socketQueueSize=10 +server.socketQueueSize=5 server.protocolVersion="HTTP/1.0" server.logToScreen=False server.logFile="/var/log/crans/intranet.log" diff --git a/intranet/modules/quota/main.py b/intranet/modules/quota/main.py index e2a74c80..6ffcd62c 100755 --- a/intranet/modules/quota/main.py +++ b/intranet/modules/quota/main.py @@ -1,9 +1,9 @@ #! /usr/bin/env python import cherrypy, tempfile, shutil, os -import crans.utils.quota + import crans.cp from ClassesIntranet.ModuleBase import ModuleBase - +import crans.utils.quota as quota class main(ModuleBase): def category(self): @@ -18,8 +18,12 @@ class main(ModuleBase): return "icon.png" def _get_quota(self): - return crans.utils.quota.getUserQuota(cherrypy.session['uid']) - #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}] + if (cherrypy.config.configMap["global"]["server.environment"] == "development"): + return quota.fake_getUserQuota(cherrypy.session['uid']) + else: + return quota.getUserQuota(cherrypy.session['uid']) + + ########################## # affichage @@ -28,7 +32,6 @@ class main(ModuleBase): # methode qui affiche la template # def index(self ): - #return "youpiiii" values = {} try: quotas = self._get_quota() @@ -60,7 +63,7 @@ class main(ModuleBase): "svg_url":"barreSVG?filesystem=%s" % a_quota['filesystem'], } returned_quotas.append(a_returned_quota) - values = {'quotas': returned_quotas, 'e': "eeede"} + values = {'quotas': returned_quotas} except Exception, e: crans.cp.log('error getting quota for user %s : %s' % (cherrypy.session['uid'], str(e)), 'QUOTA', 1) values = {'erreur':str(e)}