viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-03-03 02:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

htmlizer: skip link if same key defined in additional data

Browse Source
This commit is contained in:
Yurii
2026-01-15 10:34:50 +02:00
parent 33f3e8b6b2
commit 7760b01a50
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/Espo/Core/Htmlizer/Htmlizer.php
View File

@@ -226,7 +226,9 @@ class Htmlizer
$data = $this->prepareData($entity, $additionalData);
if (!$skipLinks && $level === 0 && $entity->hasId()) {
$this->loadRelatedCollections($entity, $template, $data);
$additionalDataKeys = is_array($additionalData) ? array_keys($additionalData) : [];
$this->loadRelatedCollections($entity, $template, $data, $additionalDataKeys);
}
$skipAttributeList = [];
@@ -244,10 +246,15 @@ class Htmlizer
/**
* @param array<string, mixed> $data
* @param string[] $skipList
*/
private function loadRelatedCollections(Entity $entity, ?string $template, array &$data): void
private function loadRelatedCollections(Entity $entity, ?string $template, array &$data, array $skipList): void
{
foreach ($entity->getRelationList() as $relation) {
if (in_array($relation, $skipList)) {
continue;
}
$collection = $this->loadRelatedCollection($entity, $relation, $template);
if ($collection) {
@@ -638,7 +645,6 @@ class Htmlizer
$rootData,
$context['fn'] ?? null,
$context['inverse'] ?? null,
//$context['fn.blockParams'],
);
$helper = $injectableFactory->create($className);