#fluidbook-workshop Fix display of files for resseler

diff --git a/images/extranet/devis.png b/images/extranet/devis.png
index 9b27fe010ef01dddc2b28521449f8040b5158087..94718902b271529dbe510218e154d393140eba11 100644 (file)
Binary files a/images/extranet/devis.png and b/images/extranet/devis.png differ

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 37f7773d2e1f1d4f8fe3b80bfddebb38e2c75816..4373eb580c7c506e9efef782f506db5c811986c4 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -301,6 +301,7 @@ class commonUrl {
                if ($core->user->ws_grade > 0 && isset($args[1])) {\r
                        $dao = new commonDAOClient($core->con);\r
                        $client = $dao->selectById($args[1]);\r
+                       fb($client);\r
                        $_SESSION['entreprise_fichiers'] = $client->entreprise;\r
                } else {\r
                        unset($_SESSION['entreprise_fichiers']);\r
@@ -371,14 +372,12 @@ class commonUrl {
                commonDroits::min(array('extranet' => 0, 'ws' => 1));\r
 \r
                global $core;\r
-               if ($core->user->ws_grade <= 0) {\r
+               if ($core->user->ws_grade <= 0  && isset($_SESSION['entreprise_fichiers'])) {\r
                        $entreprise = $core->user->entreprise;\r
                } else {\r
                        $entreprise = $_SESSION['entreprise_fichiers'];\r
                }\r
 \r
-               fb($entreprise);\r
-\r
                $settings = is_null($settings) ? $core->user->getSettings('fichiers') : $settings;\r
                $dao = new commonDAOFichier($core->con);\r
                $change = 'Fichiers';\r

diff --git a/inc/extranet/_common.php b/inc/extranet/_common.php
index 2bbaa67291d7a807ad07fc51e83b89e30d5a8a51..4462631353596c35e5d954fb152132ae97bd3212 100644 (file)
--- a/inc/extranet/_common.php
+++ b/inc/extranet/_common.php
@@ -5,7 +5,3 @@ require_once(dirname(__FILE__) . '/Controlleur/_common.php');
 require_once(dirname(__FILE__) . '/DAO/_common.php');\r
 \r
 $GLOBALS['ajaxClasses'][] = 'extranetAjax';\r
-\r
-\r
-\r
-?>
\ No newline at end of file