diff --git a/apps/maarch_entreprise/indexing_searching/change_category_actions.php b/apps/maarch_entreprise/indexing_searching/change_category_actions.php index 4ba0179fa4ea7a81deee67ddcf8ac627d4841b43..3976db13a9388f666d92f50b9dcfbc471073c16f 100755 --- a/apps/maarch_entreprise/indexing_searching/change_category_actions.php +++ b/apps/maarch_entreprise/indexing_searching/change_category_actions.php @@ -7,7 +7,7 @@ $b = new basket(); $_SESSION['category_id'] = $_REQUEST['category_id']; $actions = $b->get_actions_from_current_basket( - $_REQUEST['resId'], $_REQUEST['collId'], 'PAGE_USE', false + $_REQUEST['resId'], $_REQUEST['collId'], 'PAGE_USE', true ); if (count($actions) > 0) { //$frmStr .= '<b>' . _ACTIONS . ' : </b>'; diff --git a/modules/basket/class/class_modules_tools_Abstract.php b/modules/basket/class/class_modules_tools_Abstract.php index e4d871ee32b3e7d1e5cd91c91f80e927c8b2e28c..078743e28ca85022866acf2bd33eb90447e3db25 100755 --- a/modules/basket/class/class_modules_tools_Abstract.php +++ b/modules/basket/class/class_modules_tools_Abstract.php @@ -679,7 +679,6 @@ abstract class basket_Abstract extends Database strtoupper($mode) == 'PAGE_USE' && $_SESSION['current_basket']['actions'][$i]['PAGE_USE'] == 'Y' && $testWhere && strtoupper($resId) != 'NONE' - && ($_SESSION['current_basket']['actions'][$i]['id'] <> 'IndexingBasket') ) { $where = ' where res_id = ' . $resId; if (!empty($_SESSION['current_basket']['actions'][$i]['WHERE'])) { @@ -689,7 +688,7 @@ abstract class basket_Abstract extends Database if ($stmt->rowCount() > 0) { $arr[] = ['VALUE' => $_SESSION['current_basket']['actions'][$i]['ID'], 'LABEL' => $_SESSION['current_basket']['actions'][$i]['LABEL']]; } - } else if (strtoupper($mode) == 'PAGE_USE' && $_SESSION['current_basket']['actions'][$i]['PAGE_USE'] == 'Y' && !$testWhere) { + } else if (strtoupper($mode) == 'PAGE_USE' && $_SESSION['current_basket']['actions'][$i]['PAGE_USE'] == 'Y') { $arr[] = ['VALUE' => $_SESSION['current_basket']['actions'][$i]['ID'], 'LABEL' => $_SESSION['current_basket']['actions'][$i]['LABEL']]; } else if (strtoupper($mode) == 'MASS_USE' && $_SESSION['current_basket']['actions'][$i]['MASS_USE'] == 'Y') { // If "MASS_USE" adding the actions in the array