From: vincent@cubedesigners.com Date: Mon, 8 Feb 2010 11:40:45 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2739a3bbb820cde10e27893cfeaf45270200bbd0;p=cubeextranet.git --- diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php index e474e0dec..80f767a11 100644 --- a/inc/extranet/Controlleur/class.extranet.url.php +++ b/inc/extranet/Controlleur/class.extranet.url.php @@ -1702,15 +1702,15 @@ class extranetUrl { $res .= extranetPage::bh(); $res .= ''; if ($r->rubrique == 'projets') { - $res .= self::listeProjets($r->dashboard_id, unserialize($r->settings)); + $res .= self::listeProjets($r->dashboard_id, self::getDashboardSettings($r->settings)); } elseif ($r->rubrique == 'factures') { - $res .= self::listeFactures($r->dashboard_id, unserialize($r->settings)); + $res .= self::listeFactures($r->dashboard_id, self::getDashboardSettings($r->settings)); } elseif ($r->rubrique == 'devis') { - $res .= self::listeDevis($r->dashboard_id, unserialize($r->settings)); + $res .= self::listeDevis($r->dashboard_id, self::getDashboardSettings($r->settings)); } elseif ($r->rubrique == 'clients') { - $res .= self::listeClients($r->dashboard_id, unserialize($r->settings)); + $res .= self::listeClients($r->dashboard_id, self::getDashboardSettings($r->settings)); } elseif ($r->rubrique == 'timereport') { - $res .= self::listeTimereport($r->dashboard_id, unserialize($r->settings)); + $res .= self::listeTimereport($r->dashboard_id, self::getDashboardSettings($r->settings)); } $res .= ''; $res .= extranetPage::bf(); @@ -1718,6 +1718,15 @@ class extranetUrl { return $res; } + public static function getDashboardSettings($s) + { + $s = unserialize($s); + if (isset($s['filtres']['annee'])) { + $s['filtres']['annee'] = range(2006, date('Y'), 1); + } + return $s; + } + public static function formDashboard($args) { global $core;