fix kb id in templates

fixes glpi-project#17549
cconard96 · Jul 18, 2024 · cc6ae83 · cc6ae83
1 parent 9f7d538
commit cc6ae83
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/ContentTemplates/Parameters/TicketParameters.php b/src/ContentTemplates/Parameters/TicketParameters.php
@@ -138,7 +138,7 @@ protected function defineValues(CommonDBTM $ticket): array
         $kbis = KnowbaseItem_Item::getItems($ticket);
         $values['knowbaseitems'] = [];
         foreach ($kbis as $data) {
-            if ($kbi = KnowbaseItem::getById($data['id'])) {
+            if ($kbi = KnowbaseItem::getById($data[KnowbaseItem::getForeignKeyField()])) {
                 $kbi_parameters = new KnowbaseItemParameters();
                 $values['knowbaseitems'][] = $kbi_parameters->getValues($kbi);
             }

diff --git a/tests/functional/Glpi/ContentTemplates/Parameters/TicketParameters.php b/tests/functional/Glpi/ContentTemplates/Parameters/TicketParameters.php
@@ -97,7 +97,7 @@ public function testGetValues(): void
         $suppliers_id        = getItemByTypeName('Supplier', '_suplier01_name', true);
 
         $now = date('Y-m-d H:i:s');
-        $this->createItem('Ticket', [
+        $created_ticket = $this->createItem('Ticket', [
             'name'                  => 'ticket_testGetValues',
             'content'               => '<p>ticket_testGetValues content</p>',
             'entities_id'           => $test_entity_id,
@@ -114,8 +114,13 @@ public function testGetValues(): void
             '_groups_id_assign'     => [$assigned_groups_id],
             '_suppliers_id_assign'  => [$suppliers_id],
         ]);
+        $tickets_id = $created_ticket->getID();
 
-        $tickets_id = getItemByTypeName('Ticket', 'ticket_testGetValues', true);
+        $this->createItem(\KnowbaseItem_Item::class, [
+            'knowbaseitems_id' => getItemByTypeName(\KnowbaseItem::class, '_knowbaseitem01', true),
+            'itemtype'         => 'Ticket',
+            'items_id'         => $tickets_id,
+        ]);
 
         $parameters = $this->newTestedInstance();
         $values = $parameters->getValues(getItemByTypeName('Ticket', 'ticket_testGetValues'));
@@ -247,7 +252,14 @@ public function testGetValues(): void
                 'name'         => 'location_testGetValues',
                 'completename' => 'location_testGetValues',
             ],
-            'knowbaseitems' => [],
+            'knowbaseitems' => [
+                [
+                    'id' => getItemByTypeName(\KnowbaseItem::class, '_knowbaseitem01', true),
+                    'name' => '_knowbaseitem01',
+                    'answer' => "Answer for Knowledge base entry _knowbaseitem01 apple juice turnover",
+                    'link' => "<a  href='/glpi/front/knowbaseitem.form.php?id=1'  title=\"_knowbaseitem01\">_knowbaseitem01</a>"
+                ]
+            ],
             'assets'        => [],
         ]);