Skip to content

Fix for issue #371 #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rom1-B merged 5 commits into from
Dec 10, 2024
Merged

Fix for issue #371 #445

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e677fe
Fix for issue #371
PlaneNuts Dec 8, 2024
141604f
Edited as per requested
PlaneNuts Dec 9, 2024
fa1448f
Corrected issues with automated checks
PlaneNuts Dec 9, 2024
8960048
Updated changelog
PlaneNuts Dec 10, 2024
a24f729
Update CHANGELOG.md
PlaneNuts Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed

- Fix default entity insertion for a user
- Fixed the SQL error on creating new injection model

## [2.14.0] - 2024-10-10

Expand Down
42 changes: 21 additions & 21 deletions inc/model.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
}
Expand Down