Skip to content

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

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
stonebuzz merged 3 commits into from
Apr 2, 2026
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99b460f
fix(model): getting models created on parent entites on child entites
TarekRemo Apr 2, 2026
d2d6a78
building the models query with an array to use the GLPI DB iterator
TarekRemo Apr 2, 2026
52d816e
refactoring the db query
TarekRemo Apr 2, 2026
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 @@ -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

Expand Down
49 changes: 30 additions & 19 deletions inc/model.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,29 +382,40 @@ 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` ";

$query = [
'SELECT' => ['id', 'name', 'is_private', 'entities_id', 'is_recursive', 'itemtype', 'step', 'comment'],
'FROM' => 'glpi_plugin_datainjection_models',
];
Comment thread
Rom1-B marked this conversation as resolved.
Outdated

$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['WHERE'] = $where;
$query['ORDER'] = ['is_private DESC', 'entities_id', $order == "`name`" ? "name" : $order];
Comment thread
Rom1-B marked this conversation as resolved.
Outdated

foreach ($DB->request($query) as $data) {
if (
self::checkRightOnModel($data['id'])
&& class_exists($data['itemtype'])
Expand Down