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

N°6472 - Fix empty tables in "Progress" tab of a survey

Browse Source
This commit is contained in:
Molkobain
2023-06-27 10:36:13 +02:00
parent f338d3bdc8
commit 7fc46fbc50
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
View File

@@ -322,7 +322,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$aExtraFields[$sClassAlias][] = $sAttCode;
}
} else {
$aExtraFields['*'] = $sAttCode;
$aExtraFields['*'][] = $sFieldName;
}
}
@@ -335,11 +335,21 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
}
}
foreach ($aAuthorizedClasses as $sAlias => $sClassName) {
if (array_key_exists($sAlias, $aExtraFields)) {
// In case there is only 1 "alias" for the extra fields and it is the fallback ("*"), then consider that all fields are for the current alias.
// This is for the particular use case when the zlist is set to false and extra fields are specified.
if ( (count($aExtraFields) === 1) && (array_keys($aExtraFields)[0] === '*') ) {
$aLists[$sAlias] = $aExtraFields['*'];
}
// Regular use case, dispatch fields to their corresponding aliases
else if (array_key_exists($sAlias, $aExtraFields)) {
$aLists[$sAlias] = $aExtraFields[$sAlias];
} else {
}
// Finally, if unknown alias, ignore fields
else {
$aLists[$sAlias] = array();
}
// If zlist specified, merge its fields with the currently present
if ($sZListName !== false) {
$aDefaultList = MetaModel::FlattenZList(MetaModel::GetZListItems($sClassName, $sZListName));
$aLists[$sAlias] = array_merge($aDefaultList, $aLists[$sAlias]);