composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 01:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2847 - Datatable Fix n-n links

Browse Source
This commit is contained in:
Eric
2020-11-24 14:54:32 +01:00
parent fb70026966
commit d0baf298be
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pages/ajax.render.php
View File

@@ -321,14 +321,14 @@ try
foreach($aClassAliases as $sAlias => $sClassName)
{
$aColumnsLoad[$sAlias] = array();
foreach($aColumns[$sAlias] as $sAttCode => $aData)
{
if ($aData['checked'] == 'true')
{
if (!isset($aColumns[$sAlias])) {
continue;
}
foreach ($aColumns[$sAlias] as $sAttCode => $aData) {
if ($aData['checked'] == 'true') {
$aColumns[$sAlias][$sAttCode]['checked'] = true;
if ($sAttCode == '_key_')
{
if($sIdName == ""){
if ($sAttCode == '_key_') {
if ($sIdName == "") {
$sIdName = $sAlias."/_key_";
}
if ($iSortCol == $iSortIndex)
@@ -384,7 +384,6 @@ try
$aColumns[$sAlias][$sAttCode]['checked'] = false;
}
}
}
$aQueryParams = isset($aExtraParams['query_params']) ? $aExtraParams['query_params'] : [];
@@ -405,12 +404,14 @@ try
$aResult["recordsFiltered"] = $oSet->Count() ;
$aResult["data"] = [];
while ($aObject = $oSet->FetchAssoc()) {
foreach($aClassAliases as $sAlias=>$sClass) {
foreach($aColumns[$sAlias] as $sAttCode => $oAttDef) {
if ($sAttCode == "_key_") {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetKey();
} else {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetAsHTML($sAttCode);
foreach($aClassAliases as $sAlias=>$sClass) {
if (isset($aColumns[$sAlias])) {
foreach ($aColumns[$sAlias] as $sAttCode => $oAttDef) {
if ($sAttCode == "_key_") {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetKey();
} else {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetAsHTML($sAttCode);
}
}
}
}