Fix for issue #371 (#445)

* Fix for issue #371 * Edited as per requested * Corrected issues with automated checks * Updated changelog * Update CHANGELOG.md Co-authored-by: Stanislas <[email protected]> --------- Co-authored-by: Stanislas <[email protected]>
pluginsGLPI · Dec 10, 2024 · abe9757 · abe9757
1 parent 6987172
commit abe9757
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Fix default entity insertion for a user
+- Fixed `SQL` error when creating new injection model
 
 ## [2.14.0] - 2024-10-10
 

diff --git a/inc/model.class.php b/inc/model.class.php
@@ -1340,29 +1340,29 @@ public static function checkRightOnModel($models_id)
         /** @var DBmysql $DB */
         global $DB;
 
-        $model = new self();
-        $model->getFromDB($models_id);
-
         $continue = true;
 
-        $query = "(SELECT `itemtype`
-                 FROM `glpi_plugin_datainjection_models`
-                 WHERE `id` = '" . $models_id . "')
-                UNION (SELECT DISTINCT `itemtype`
-                       FROM `glpi_plugin_datainjection_mappings`
-                       WHERE `models_id` = '" . $models_id . "')
-                UNION (SELECT DISTINCT `itemtype`
-                       FROM `glpi_plugin_datainjection_infos`
-                       WHERE `models_id` = '" . $models_id . "')";
-        foreach ($DB->request($query) as $data) {
-            if ($data['itemtype'] != PluginDatainjectionInjectionType::NO_VALUE) {
-                if (class_exists($data['itemtype'])) {
-                    $item                     = new $data['itemtype']();
-                    $item->fields['itemtype'] = $model->fields['itemtype'];
-
-                    if (!($item instanceof CommonDBRelation) && !$item->canCreate()) {
-                        $continue = false;
-                        break;
+        $model = new self();
+        if ($model->getFromDB($models_id)) {
+            $query = "(SELECT `itemtype`
+                    FROM `glpi_plugin_datainjection_models`
+                    WHERE `id` = '" . $models_id . "')
+                    UNION (SELECT DISTINCT `itemtype`
+                        FROM `glpi_plugin_datainjection_mappings`
+                        WHERE `models_id` = '" . $models_id . "')
+                    UNION (SELECT DISTINCT `itemtype`
+                        FROM `glpi_plugin_datainjection_infos`
+                        WHERE `models_id` = '" . $models_id . "')";
+            foreach ($DB->request($query) as $data) {
+                if ($data['itemtype'] != PluginDatainjectionInjectionType::NO_VALUE) {
+                    if (class_exists($data['itemtype'])) {
+                        $item                     = new $data['itemtype']();
+                        $item->fields['itemtype'] = $model->fields['itemtype'];
+
+                        if (!($item instanceof CommonDBRelation) && !$item->canCreate()) {
+                            $continue = false;
+                            break;
+                        }
                     }
                 }
             }