Fix: Try to fix expand pb

This commit is contained in:
Laurent Destailleur 2009-05-22 15:00:40 +00:00
parent 1f50293155
commit 61bb79f8ce

View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org> /* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org>
* Copyright (C) 2005 Éric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2005 <EFBFBD>ric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
@ -71,7 +71,7 @@ print '</tr>';
print '<tr '.$bc[0].'><td>'; print '<tr '.$bc[0].'><td>';
print $langs->trans("Name").':</td><td><input class="flat" type="text" size="20" name="catname" value="' . $_POST['catname'] . '"/></td><td><input type="submit" class="button" value="'.$langs->trans ("Search").'"></td></tr>'; print $langs->trans("Name").':</td><td><input class="flat" type="text" size="20" name="catname" value="' . $_POST['catname'] . '"/></td><td><input type="submit" class="button" value="'.$langs->trans ("Search").'"></td></tr>';
/* /*
// faire une rech dans une sous catégorie uniquement // faire une rech dans une sous cat<EFBFBD>gorie uniquement
print '<tr '.$bc[0].'><td>'; print '<tr '.$bc[0].'><td>';
print $langs->trans("SubCatOf").':</td><td>'; print $langs->trans("SubCatOf").':</td><td>';
@ -86,7 +86,7 @@ print '</td><td valign="top" width="70%">';
/* /*
* Catégories trouvées * Categories found
*/ */
if($_POST['catname'] || $_REQUEST['id']) if($_POST['catname'] || $_REQUEST['id'])
{ {
@ -164,7 +164,7 @@ foreach($fulltree as $key => $val)
// Update expandedsectionarray in session // Update expandedsectionarray in session
$expandedsectionarray=array(); $expandedsectionarray=array();
if (isset($_SESSION['expandedsectionarray'])) $expandedsectionarray=split(',',$_SESSION['expandedsectionarray']); if (isset($_SESSION['dol_expandedsectionarray'])) $expandedsectionarray=split(',',$_SESSION['dol_expandedsectionarray']);
if ($section && $_GET['sectionexpand'] == 'true') if ($section && $_GET['sectionexpand'] == 'true')
{ {
@ -177,7 +177,7 @@ if ($section && $_GET['sectionexpand'] == 'true')
$expandedsectionarray[]=$idcursor; $expandedsectionarray[]=$idcursor;
} }
} }
$_SESSION['expandedsectionarray']=join(',',$expandedsectionarray); $_SESSION['dol_expandedsectionarray']=join(',',$expandedsectionarray);
} }
if ($section && $_GET['sectionexpand'] == 'false') if ($section && $_GET['sectionexpand'] == 'false')
{ {
@ -189,9 +189,9 @@ if ($section && $_GET['sectionexpand'] == 'false')
// is_in_subtree(fulltree,sectionparent,sectionchild) // is_in_subtree(fulltree,sectionparent,sectionchild)
if ($sectioncursor && ! is_in_subtree($fulltree,$section,$sectioncursor)) $expandedsectionarray[]=$sectioncursor; if ($sectioncursor && ! is_in_subtree($fulltree,$section,$sectioncursor)) $expandedsectionarray[]=$sectioncursor;
} }
$_SESSION['expandedsectionarray']=join(',',$expandedsectionarray); $_SESSION['dol_expandedsectionarray']=join(',',$expandedsectionarray);
} }
//print $_SESSION['expandedsectionarray'].'<br>'; //print $_SESSION['dol_expandedsectionarray'].'<br>';
$nbofentries=0; $nbofentries=0;
$oldvallevel=0; $oldvallevel=0;