(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index e474e0dec52df9d40fb8a788f770967f4e417439..80f767a11642b6d85dd8bada780ce5b9f634c0d4 100644 (file)
--- 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();\r
                $res .= '<div' . $hide . '>';\r
                if ($r->rubrique == 'projets') {\r
-                       $res .= self::listeProjets($r->dashboard_id, unserialize($r->settings));\r
+                       $res .= self::listeProjets($r->dashboard_id, self::getDashboardSettings($r->settings));\r
                } elseif ($r->rubrique == 'factures') {\r
-                       $res .= self::listeFactures($r->dashboard_id, unserialize($r->settings));\r
+                       $res .= self::listeFactures($r->dashboard_id, self::getDashboardSettings($r->settings));\r
                } elseif ($r->rubrique == 'devis') {\r
-                       $res .= self::listeDevis($r->dashboard_id, unserialize($r->settings));\r
+                       $res .= self::listeDevis($r->dashboard_id, self::getDashboardSettings($r->settings));\r
                } elseif ($r->rubrique == 'clients') {\r
-                       $res .= self::listeClients($r->dashboard_id, unserialize($r->settings));\r
+                       $res .= self::listeClients($r->dashboard_id, self::getDashboardSettings($r->settings));\r
                } elseif ($r->rubrique == 'timereport') {\r
-                       $res .= self::listeTimereport($r->dashboard_id, unserialize($r->settings));\r
+                       $res .= self::listeTimereport($r->dashboard_id, self::getDashboardSettings($r->settings));\r
                }\r
                $res .= '</div>';\r
                $res .= extranetPage::bf();\r
@@ -1718,6 +1718,15 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
+       public static function getDashboardSettings($s)\r
+       {\r
+               $s = unserialize($s);\r
+               if (isset($s['filtres']['annee'])) {\r
+                       $s['filtres']['annee'] = range(2006, date('Y'), 1);\r
+               }\r
+               return $s;\r
+       }\r
+\r
        public static function formDashboard($args)\r
        {\r
                global $core;\r