fix(model): getting models created on parent entites on child entites (#600)

* fix(model): getting models created on parent entites on child entites

* building the models query with an array to use the GLPI DB iterator

* refactoring the db query

Author: TarekRemo

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Fix crash when injection model has no mandatory fields defined
+- Fix models created on parent entities can't be used on child entites
 
 ## [2.15.4] - 2026-03-16
 

inc/model.class.php

@@ -382,29 +382,52 @@ public static function getModels($user_id, $order = "name", $entity = -1, $all =
         global $DB;
 
         $models =  [];
-        $query = "SELECT `id`, `name`, `is_private`, `entities_id`, `is_recursive`, `itemtype`,
-                       `step`, `comment`
-                FROM `glpi_plugin_datainjection_models` ";
 
+        $where = [];
         if (!$all) {
-            $query .= " WHERE `step` = '" . self::READY_TO_USE_STEP . "' AND (";
-        } else {
-            $query .= " WHERE (";
+            $where['step'] = self::READY_TO_USE_STEP;
         }
 
-        $query .= "(`is_private` = '" . self::MODEL_PUBLIC . "'" .
-                getEntitiesRestrictRequest(
-                    " AND",
-                    "glpi_plugin_datainjection_models",
-                    "entities_id",
-                    $entity,
-                    false,
-                ) . ")
-                  OR (`is_private` = '" . self::MODEL_PRIVATE . "' AND `users_id` = '$user_id'))
-                 ORDER BY `is_private` DESC,
-                          `entities_id`, " . ($order == "`name`" ? "`name`" : $order);
-
-        foreach ($DB->doQuery($query) as $data) {
+        $restrict = getEntitiesRestrictCriteria(
+            'glpi_plugin_datainjection_models',
+            'entities_id',
+            $entity,
+            true,
+        );
+
+        $where[] = [
+            'OR' => [
+                [
+                    'is_private' => self::MODEL_PUBLIC,
+                ] + $restrict,
+                [
+                    'is_private' => self::MODEL_PRIVATE,
+                    'users_id'   => $user_id,
+                ],
+            ],
+        ];
+
+        $query = [
+            'SELECT' => [
+                'id',
+                'name',
+                'is_private',
+                'entities_id',
+                'is_recursive',
+                'itemtype',
+                'step',
+                'comment',
+            ],
+            'FROM'   => 'glpi_plugin_datainjection_models',
+            'WHERE' => $where,
+            'ORDER' => [
+                'is_private DESC',
+                'entities_id',
+                $order == "`name`" ? "name" : $order,
+            ],
+        ];
+
+        foreach ($DB->request($query) as $data) {
             if (
                 self::checkRightOnModel($data['id'])
                 && class_exists($data['itemtype'])