From 4725520312c2ebcdb3efd25edc100d14b170b41d Mon Sep 17 00:00:00 2001 From: Mohammed Ghouse Date: Wed, 21 Oct 2026 20:46:36 +0530 Subject: [PATCH 1/3] Use itemtype in values lookups --- CHANGELOG.md | 1 + inc/container.class.php | 10 +++++----- inc/field.class.php | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b19cb7d..b407a0cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Fix search criterion value on multiple dropdown fields being reset after a search, which emptied the criterion when sorting or paging results - Fix item clone failing when a mandatory GLPI item field is in an "Insert in form" block - Fix `Some mandatory fields are empty` error displayed when creating an item with an assigned technician +- Fix slow display and save of items with additional fields when the values tables are large ## [1.24.7] - 2026-10-28 diff --git a/inc/container.class.php b/inc/container.class.php index a18b68df..c71b0f8d 100644 --- a/inc/container.class.php +++ b/inc/container.class.php @@ -1055,7 +1055,7 @@ public static function preItemPurge($item) } $fields = new $classname(); - $fields->deleteByCriteria(['items_id' => $item->fields['id']], true); + $fields->deleteByCriteria(['itemtype' => $itemtype, 'items_id' => $item->fields['id']], true); } } @@ -1772,7 +1772,7 @@ public function updateFieldsValues($data, $itemtype, $massiveaction = false) $obj = new $classname(); - $exist = $obj->getFromDBByCrit(['items_id' => $items_id]); + $exist = $obj->getFromDBByCrit(['itemtype' => $itemtype, 'items_id' => $items_id]); // Convert "multiple" values into a JSON string $multiple_fields_iterator = $DB->request([ @@ -1817,7 +1817,7 @@ public function updateFieldsValues($data, $itemtype, $massiveaction = false) $obj = $dbu->getItemForItemtype($classname); if ($obj !== false) { - if ($obj->getFromDBByCrit(['items_id' => $items_id]) === false) { + if ($obj->getFromDBByCrit(['itemtype' => $itemtype, 'items_id' => $items_id]) === false) { // add fields data $obj->add($data); } else { @@ -2276,7 +2276,7 @@ private static function getStoredValues(self $container, string $itemtype, int $ } $values_obj = (new DbUtils())->getItemForItemtype(self::getClassname($itemtype, $container->fields['name'])); - if ($values_obj === false || !$values_obj->getFromDBByCrit(['items_id' => $items_id])) { + if ($values_obj === false || !$values_obj->getFromDBByCrit(['itemtype' => $itemtype, 'items_id' => $items_id])) { return []; } @@ -2721,7 +2721,7 @@ private static function checkContainerMandatory(CommonDBTM $item, PluginFieldsCo $classname = self::getClassname($item::getType(), $loc_c->fields['name']); $dbu = new DbUtils(); $obj = $dbu->getItemForItemtype($classname); - if ($obj !== false && $obj->getFromDBByCrit(['items_id' => $item->getID()])) { + if ($obj !== false && $obj->getFromDBByCrit(['itemtype' => $item::getType(), 'items_id' => $item->getID()])) { $data += $obj->fields; } else { $data += self::getPendingValues($item, $c_id); diff --git a/inc/field.class.php b/inc/field.class.php index 82817259..2f989dc4 100644 --- a/inc/field.class.php +++ b/inc/field.class.php @@ -1280,6 +1280,7 @@ public static function prepareHtmlFields( if ($obj instanceof CommonDBTM) { $found_values = $obj->find( [ + 'itemtype' => $item::getType(), 'plugin_fields_containers_id' => $first_field['plugin_fields_containers_id'], 'items_id' => $item->getID(), ], From 9fdac3c03e6b50545300ab887ec3942c3c45d13b Mon Sep 17 00:00:00 2001 From: Mohammed Ghouse Date: Thu, 29 Oct 2026 17:03:30 +0530 Subject: [PATCH 2/3] Add test for values lookups by itemtype --- tests/Units/ContainerTest.php | 59 +++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/tests/Units/ContainerTest.php b/tests/Units/ContainerTest.php index c4543ab5..129d73bf 100644 --- a/tests/Units/ContainerTest.php +++ b/tests/Units/ContainerTest.php @@ -1108,4 +1108,63 @@ public function testRenameOversizedContainerFailsOnNameCollision(): void $this->assertTrue($reloaded->getFromDB($container->getID())); $this->assertSame(0, (int) $reloaded->fields['is_active']); } + + public function testValuesAreReadAndPurgedForTheirItemtypeOnly(): void + { + $container = $this->createFieldContainer([ + 'label' => 'Itemtype values ' . $this->getUniqueString(), + 'type' => 'tab', + 'itemtypes' => [Computer::class], + 'is_active' => 1, + 'entities_id' => 0, + 'is_recursive' => 1, + ]); + + $field = $this->createField([ + 'label' => 'Itemtype text ' . str_replace('-', '', $this->getUniqueString()), + 'type' => 'text', + PluginFieldsContainer::getForeignKeyField() => $container->getID(), + 'ranking' => 1, + 'is_active' => 1, + 'is_readonly' => 0, + ]); + $field_name = $field->fields['name']; + + $computer = $this->createItem(Computer::class, [ + 'name' => 'Computer with itemtype values', + 'entities_id' => 0, + ]); + $this->assertTrue((new Computer())->update([ + 'id' => $computer->getID(), + $field_name => 'computer value', + ])); + + // Values row of another itemtype sharing the same items_id + /** @var DBmysql $DB */ + global $DB; + $table = getTableForItemType(PluginFieldsContainer::getClassname(Computer::class, $container->fields['name'])); + $DB->insert($table, [ + 'items_id' => $computer->getID(), + 'itemtype' => Monitor::class, + PluginFieldsContainer::getForeignKeyField() => $container->getID(), + $field_name => 'monitor value', + ]); + + $this->assertTrue((new Computer())->update([ + 'id' => $computer->getID(), + $field_name => 'updated computer value', + ])); + + $values = []; + foreach ($DB->request(['FROM' => $table, 'WHERE' => ['items_id' => $computer->getID()]]) as $row) { + $values[$row['itemtype']] = $row[$field_name]; + } + $this->assertSame([Computer::class => 'updated computer value', Monitor::class => 'monitor value'], $values); + + $this->assertTrue((new Computer())->delete(['id' => $computer->getID()], true)); + + $rows = $DB->request(['FROM' => $table, 'WHERE' => ['items_id' => $computer->getID()]]); + $this->assertCount(1, $rows); + $this->assertSame(Monitor::class, $rows->current()['itemtype']); + } } From e33e8cfd49c4c246aae102e671675e949cd27ee6 Mon Sep 17 00:00:00 2001 From: RomainLvr Date: Thu, 29 Oct 2026 13:48:53 +0100 Subject: [PATCH 3/3] Rector --- tests/Units/ContainerTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Units/ContainerTest.php b/tests/Units/ContainerTest.php index 129d73bf..d127658e 100644 --- a/tests/Units/ContainerTest.php +++ b/tests/Units/ContainerTest.php @@ -1159,6 +1159,7 @@ public function testValuesAreReadAndPurgedForTheirItemtypeOnly(): void foreach ($DB->request(['FROM' => $table, 'WHERE' => ['items_id' => $computer->getID()]]) as $row) { $values[$row['itemtype']] = $row[$field_name]; } + $this->assertSame([Computer::class => 'updated computer value', Monitor::class => 'monitor value'], $values); $this->assertTrue((new Computer())->delete(['id' => $computer->getID()], true));