fix row ids too

cconard96 · Jan 24, 2024 · 0687a41 · 0687a41
1 parent 7bb0309
commit 0687a41
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/Search/Input/QueryBuilder.php b/src/Search/Input/QueryBuilder.php
@@ -480,9 +480,6 @@ public static function displayCriteria($request = [])
      */
     public static function displayMetaCriteria($request = [])
     {
-        /** @var array $CFG_GLPI */
-        global $CFG_GLPI;
-
         if (
             !isset($request["itemtype"])
             || !isset($request["num"])
@@ -518,7 +515,7 @@ public static function displayMetaCriteria($request = [])
         $linked =  SearchEngine::getMetaItemtypeAvailable($itemtype);
         $rand   = mt_rand();
 
-        $rowid  = 'metasearchrow' . $request['itemtype'] . $rand;
+        $rowid  = 'metasearchrow' . Toolbox::getNormalizedItemtype($request['itemtype']) . $rand;
         TemplateRenderer::getInstance()->display('components/search/query_builder/metacriteria.html.twig', [
             'row_id'       => $rowid,
             'metacriteria' => $metacriteria,
@@ -613,7 +610,7 @@ public static function displayCriteriaGroup($request = [])
         $num         = (int) $request['num'];
         $p           = $request['p'];
         $randrow     = mt_rand();
-        $rowid       = 'searchrow' . $request['itemtype'] . $randrow;
+        $rowid       = 'searchrow' . Toolbox::getNormalizedItemtype($request['itemtype']) . $randrow;
         $prefix      = isset($p['prefix_crit']) ? htmlspecialchars($p['prefix_crit']) : '';
         $parents_num = isset($p['parents_num']) ? $p['parents_num'] : [];