composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 06:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix link on key in datatable

Browse Source
This commit is contained in:
acognet
2021-05-04 11:58:05 +02:00
parent 16c9599739
commit e5498e3292
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sources/Controller/AjaxRenderController.php
View File

@@ -315,6 +315,7 @@ class AjaxRenderController
foreach ($aClassAliases as $sAlias => $sClass) {
if (isset($aObject[$sAlias])) {
$aObj[$sAlias."/_key_"] = $aObject[$sAlias]->GetKey();
$aObj[$sAlias."/hyperlink"] = $aObject[$sAlias]->GetHyperlink();
foreach ($aObject[$sAlias]->GetLoadedAttributes() as $sAttCode) {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetAsHTML($sAttCode);
}

6
sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
View File

@@ -339,7 +339,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
'attribute_code' => $sAttCode,
'attribute_type' => '_key_',
'attribute_label' => MetaModel::GetName($sClassName),
'render' => $sDisplayFunction,
'render' => "return row['".$sClassAlias."/hyperlink'];",
];
}
@@ -574,7 +574,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
'attribute_code' => $sAttCode,
'attribute_type' => '_key_',
'attribute_label' => $aData['alias'],
"render" => $sRender,
"render" => "return row['".$sClassAlias."/hyperlink'];",
];
}
} else {
@@ -714,7 +714,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$sDisplay = "let displayField = '<span class=\"object-ref\" title=\"".$sClassAlias."::'+data+'\"><a class=\'object-ref-link\' href=\'".$oAppRoot."/pages/UI.php?operation=details&class=".$sClassName."&id='+data+'\'>'+row['".$sClassAlias."/friendlyname']+'</a></span>'; return displayField;";
}
$aColumnDefinition["render"] = [
"display" => $sDisplay,
"display" => "return row['".$sClassAlias."/hyperlink'];",
"_" => $sClassAlias."/".$sAttCode,
];
} else {