Skip to content

Commit 141604f

Browse files
committed
Edited as per requested
1 parent 5e677fe commit 141604f

File tree

1 file changed

+22
-25
lines changed

1 file changed

+22
-25
lines changed

inc/model.class.php

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,33 +1340,30 @@ public static function checkRightOnModel($models_id)
13401340
/** @var DBmysql $DB */
13411341
global $DB;
13421342

1343-
$model = new self();
1344-
$model->getFromDB($models_id);
1345-
13461343
$continue = true;
13471344

1348-
if(empty($models_id)){
1349-
$models_id = '-1';
1350-
}
1351-
1352-
$query = "(SELECT `itemtype`
1353-
FROM `glpi_plugin_datainjection_models`
1354-
WHERE `id` = '" . $models_id . "')
1355-
UNION (SELECT DISTINCT `itemtype`
1356-
FROM `glpi_plugin_datainjection_mappings`
1357-
WHERE `models_id` = '" . $models_id . "')
1358-
UNION (SELECT DISTINCT `itemtype`
1359-
FROM `glpi_plugin_datainjection_infos`
1360-
WHERE `models_id` = '" . $models_id . "')";
1361-
foreach ($DB->request($query) as $data) {
1362-
if ($data['itemtype'] != PluginDatainjectionInjectionType::NO_VALUE) {
1363-
if (class_exists($data['itemtype'])) {
1364-
$item = new $data['itemtype']();
1365-
$item->fields['itemtype'] = $model->fields['itemtype'];
1366-
1367-
if (!($item instanceof CommonDBRelation) && !$item->canCreate()) {
1368-
$continue = false;
1369-
break;
1345+
$model = new self();
1346+
1347+
if($model->getFromDB($models_id)){
1348+
$query = "(SELECT `itemtype`
1349+
FROM `glpi_plugin_datainjection_models`
1350+
WHERE `id` = '" . $models_id . "')
1351+
UNION (SELECT DISTINCT `itemtype`
1352+
FROM `glpi_plugin_datainjection_mappings`
1353+
WHERE `models_id` = '" . $models_id . "')
1354+
UNION (SELECT DISTINCT `itemtype`
1355+
FROM `glpi_plugin_datainjection_infos`
1356+
WHERE `models_id` = '" . $models_id . "')";
1357+
foreach ($DB->request($query) as $data) {
1358+
if ($data['itemtype'] != PluginDatainjectionInjectionType::NO_VALUE) {
1359+
if (class_exists($data['itemtype'])) {
1360+
$item = new $data['itemtype']();
1361+
$item->fields['itemtype'] = $model->fields['itemtype'];
1362+
1363+
if (!($item instanceof CommonDBRelation) && !$item->canCreate()) {
1364+
$continue = false;
1365+
break;
1366+
}
13701367
}
13711368
}
13721369
}

0 commit comments

Comments
 (0)