lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Canvas works correctly

Browse Source
This commit is contained in:
Laurent Destailleur 2008-05-13 21:54:32 +00:00
parent fa9c8f6398
commit 2e29ea0edc
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/admin/produit.php
View File

@ -110,6 +110,9 @@ else if ($_POST["action"] == 'confirmDeleteProdLineInForm')
else if ($_POST["action"] == 'ProductCanvasAbility') else if ($_POST["action"] == 'ProductCanvasAbility')
{ {
dolibarr_set_const($db, "PRODUCT_CANVAS_ABILITY", $_POST["ProductCanvasAbility"]); dolibarr_set_const($db, "PRODUCT_CANVAS_ABILITY", $_POST["ProductCanvasAbility"]);
// Create temp directory for smarty
if (! empty($dolibarr_smarty_compile)) create_exdir($dolibarr_smarty_compile);
if (! empty($dolibarr_smarty_cache)) create_exdir($dolibarr_smarty_cache);
} }
else if ($_POST["action"] == 'usesearchtoselectproduct') else if ($_POST["action"] == 'usesearchtoselectproduct')
{ {
@ -290,8 +293,8 @@ if ($conf->barcode->enabled && $conf->global->PRODUIT_USE_BARCODE)
print '</form>'; print '</form>';
} }
// Only rodolphe and auguria menu manage canvas menu (auguria not correctly yet)
if ($conf->left_menu == 'default.php' || $conf->left_menu == 'auguria_backoffice.php') if (eregi('^rodolphe',$conf->left_menu) || eregi('^auguria',$conf->left_menu))
{ {
// Propose utilisation de canvas. // Propose utilisation de canvas.
// Ces derniers ne sont geres que par le menu default // Ces derniers ne sont geres que par le menu default

12
htdocs/main.inc.php
View File

@ -467,8 +467,8 @@ else // Si utilisateur externe
$conf->left_menu=$conf->global->MAIN_MENUFRONT_BARRELEFT; $conf->left_menu=$conf->global->MAIN_MENUFRONT_BARRELEFT;
} }
// Only default and auguria menu manage canvas menu (auguria not correctly yet) // Only rodolphe and auguria menu manage canvas menu (auguria not correctly yet)
if (! eregi('^default',$conf->left_menu) && ! eregi('^auguria',$conf->left_menu)) $conf->global->PRODUCT_CANVAS_ABILITY=0; if (! eregi('^rodolphe',$conf->left_menu) && ! eregi('^auguria',$conf->left_menu)) $conf->global->PRODUCT_CANVAS_ABILITY=0;
// Si besoin de smarty // Si besoin de smarty
if ($conf->global->PRODUCT_CANVAS_ABILITY) if ($conf->global->PRODUCT_CANVAS_ABILITY)
@ -476,9 +476,13 @@ if ($conf->global->PRODUCT_CANVAS_ABILITY)
// SMARTY // SMARTY
// Definit dans le fichier de conf // Definit dans le fichier de conf
// $dolibarr_smarty_libs_dir="/home/www/dolibarr/external-libs/smarty/libs/"; // $dolibarr_smarty_libs_dir="/home/www/dolibarr/external-libs/smarty/libs/";
// $dolibarr_smarty_compile="/home/www/dolibarr/documents/temp/smarty_templates"; // $dolibarr_smarty_compile="/home/www/dolibarr/documents/smarty/templates/temp";
// $dolibarr_smarty_cache="/home/www/dolibarr/documents/temp/smarty_cache"; // $dolibarr_smarty_cache="/home/www/dolibarr/documents/smarty/cache/temp";
if (empty($dolibarr_smarty_libs_dir)) $dolibarr_smarty_libs_dir=$dolibarr_main_document_root.'/../external-libs/smarty/libs/';
if (empty($dolibarr_smarty_compile)) $dolibarr_smarty_compile=$dolibarr_main_data_root.'/smarty/templates/temp';
if (empty($dolibarr_smarty_cache)) $dolibarr_smarty_cache=$dolibarr_main_data_root.'/smarty/cache/temp';
$smarty_libs = $dolibarr_smarty_libs_dir. "Smarty.class.php"; $smarty_libs = $dolibarr_smarty_libs_dir. "Smarty.class.php";
if (file_exists ($smarty_libs)) if (file_exists ($smarty_libs))
{ {