composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-05 09:04:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°1386 - Advanced Search: Navigation in list - Browse this list - fix display

Browse Source
This commit is contained in:
acognet
2023-05-24 11:41:06 +02:00
parent 1df7c3d8f3
commit 9ebcbf2459
9 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -572,21 +572,32 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$aExtraParams['table_id'] = $sTableId;
$aExtraParams['list_id'] = $sListId;
$oFilter = $oSet->GetFilter();
$sBasketAliasClass = $oFilter->GetFirstJoinedClassAlias();
if ($sBasketAliasClass === 'Link') {
$sLinkToBasket = $sBasketAliasClass.'/'.$sTargetAttr;
$sBasketAliasClass = 'Remote';
} else {
$sLinkToBasket = $sBasketAliasClass;
}
$oDataTable->SetOptions($aOptions);
$oDataTable->SetAjaxUrl(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php");
$oDataTable->SetAjaxData([
"operation" => 'search',
"filter" => $oSet->GetFilter()->serialize(),
"filter" => $oFilter->serialize(),
"columns" => $oCustomSettings->aColumns,
"extra_params" => $aExtraParams,
"class_aliases" => $aClassAliases,
"select_mode" => $sSelectMode,
"basket" => $sLinkToBasket,
]);
$oDataTable->SetDisplayColumns($aColumnDefinition);
$oDataTable->SetResultColumns($oCustomSettings->aColumns);
$oDataTable->SetFilter($oSet->GetFilter()->ToOQL(true));
$oDataTable->SetInitDisplayData(AjaxRenderController::GetDataForTable($oSet, $aClassAliases, $aColumnsToLoad, $sIdName, $aExtraParams, 1, true));
$oFilter->SetSelectedClasses([$sBasketAliasClass]);
$oDataTable->SetFilter($oFilter->ToOQL(true));
$oDataTable->SetInitDisplayData(AjaxRenderController::GetDataForTable($oSet, $aClassAliases, $aColumnsToLoad, $sIdName, $aExtraParams, 1, $sLinkToBasket));
// row actions
if (isset($aExtraParams['row_actions'])) {