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

Objects list: Add tree group by option to DataTableUIBlockFactory WIP

Browse Source
This commit is contained in:
Molkobain
2026-04-26 15:12:55 +02:00
parent 5a25554f4e
commit 7f9f9a528e
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,6 +300,9 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
// Initialize and check the parameters
$bViewLink = isset($aExtraParams['view_link']) ? $aExtraParams['view_link'] : true;
// Check if this is a tree grouping view
$sTreeGroupingAttr = $aExtraParams['tree_grouping_attr'] ?? '';
$bIsTreeGroupingView = utils::IsNotNullOrEmptyString($sTreeGroupingAttr);
// Check if there is a list of aliases to limit the display to...
$aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(',', $aExtraParams['display_aliases']) : [];
$sZListName = isset($aExtraParams['zlist']) ? ($aExtraParams['zlist']) : 'list';
@@ -452,6 +455,11 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$oCustomSettings = $oDefaultSettings;
}
// Tree grouping mode: Disable pagination so the full dataset is embedded in the page, otherwise there will be glitches in grouping / sorting
if ($bIsTreeGroupingView) {
$oCustomSettings->iDefaultPageSize = 0;
}
if ($oCustomSettings->iDefaultPageSize > 0) {
$oSet->SetLimit($oCustomSettings->iDefaultPageSize);
}
@@ -467,17 +475,18 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
// Load only the requested columns
$aColumnsToLoad = [];
foreach ($oCustomSettings->aColumns as $sAlias => $aColumnsInfo) {
$sClass = $aClassAliases[$sAlias];
foreach ($aColumnsInfo as $sAttCode => $aData) {
$bForceLoad = false;
if ($aData['sort'] != 'none' || isset($oCustomSettings->aSortOrder[$sAttCode])) {
$bForceLoad = true;
}
if ($sAttCode != '_key_') {
if ($aData['checked'] || $bForceLoad) {
$aColumnsToLoad[$sAlias][] = $sAttCode;
} else {
// See if this column is a must to load
$sClass = $aClassAliases[$sAlias];
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
if ($oAttDef->AlwaysLoadInTables()) {
$aColumnsToLoad[$sAlias][] = $sAttCode;
@@ -489,6 +498,13 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
}
}
}
// Tree grouping mode: ensure the grouping attribute is loaded even if not displayed
if ($bIsTreeGroupingView
&& MetaModel::IsValidAttCode($sClass, $sTreeGroupingAttr)
&& !in_array($sTreeGroupingAttr, $aColumnsToLoad[$sAlias] ?? [])) {
$aColumnsToLoad[$sAlias][] = $sTreeGroupingAttr;
}
}
$oSet->OptimizeColumnLoad($aColumnsToLoad);
@@ -984,6 +1000,8 @@ JS;
/** Don't provide the standard object creation feature */
'display_unauthorized_objects',
/** bool Display objects for which the user has no read rights */
'tree_grouping_attr',
/** string Attribute code to group objects on as a collapsible tree */
];
}
}