From 16dedbbe62bc3aeb5b5d0611fdee3ff4d229ca9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Fri, 21 Jun 2013 19:04:06 +0200 Subject: [PATCH] =?UTF-8?q?[Oublis]=20On=20augmente=20le=20nombre=20d'entr?= =?UTF-8?q?=C3=A9es=20dans=20l'historique=20pour=20l'upload,=20et=20on=20c?= =?UTF-8?q?orrige=20un=20bug=20sur=20ridtools?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/ridtools.py | 2 +- surveillance/fiche_deconnexion/generate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gestion/ridtools.py b/gestion/ridtools.py index 1be49e8b..313fcd25 100644 --- a/gestion/ridtools.py +++ b/gestion/ridtools.py @@ -154,7 +154,7 @@ def find_rid_plage(rid): if isinstance(plages, list): for begin, end in plages: if begin <= rid <= end: - return tp, (begin, end) + return tp, config.rid_primaires[tp][0] else: (begin, end) = plages if begin <= rid <= end: diff --git a/surveillance/fiche_deconnexion/generate.py b/surveillance/fiche_deconnexion/generate.py index 39ccaf7e..f3bba60d 100755 --- a/surveillance/fiche_deconnexion/generate.py +++ b/surveillance/fiche_deconnexion/generate.py @@ -88,7 +88,7 @@ def generate_ps(sanction, proprio, db): # transfomation en tuple (date, sanction) historique = [ (time.strftime('%A %d %B %Y', time.localtime(int(bl[0]))), bl[-1]) for bl in historique ] # On ne prend au maximum que les 5 dernières occurences - historique = historique[-5:] + historique = historique[-7:] # tranformation en ligne if sanction == 'upload' : # On donne la valeur de l'upload