FIX #5491 prendre en compte catégorie et clause where pour afficher les actions

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>';

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