composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-25 19:48:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1386 - Advanced Search: Navigation in list - Browse this list - new version

Browse Source
This commit is contained in:
acognet
2023-05-22 13:40:46 +02:00
parent d4e64bc479
commit f4545615cb
12 changed files with 141 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sources/Application/UI/Base/Component/DataTable/DataTable.php
View File

@@ -48,6 +48,7 @@ class DataTable extends UIContentBlock
protected $aAjaxData;
protected $aDisplayColumns;
protected $aResultColumns;
protected $sFilter;
/**
* @var string
*/
@@ -221,8 +222,25 @@ class DataTable extends UIContentBlock
return json_encode($this->aInitDisplayData);
}
/**
* @return string
*/
public function GetFilter()
{
return $this->sFilter;
}
/**
* @param string $sFilter
*/
public function setFilter($sFilter): void
{
$this->sFilter = $sFilter;
}
/**
* Get $aInitDisplayData
*
* @return array
*/
public function GetInitDisplayData(): array

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

@@ -585,17 +585,18 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
]);
$oDataTable->SetDisplayColumns($aColumnDefinition);
$oDataTable->SetResultColumns($oCustomSettings->aColumns);
$oDataTable->SetInitDisplayData(AjaxRenderController::GetDataForTable($oSet, $aClassAliases, $aColumnsToLoad, $sIdName, $aExtraParams));
$oDataTable->SetFilter($oSet->GetFilter()->ToOQL(true));
$oDataTable->SetInitDisplayData(AjaxRenderController::GetDataForTable($oSet, $aClassAliases, $aColumnsToLoad, $sIdName, $aExtraParams, 1, true));
// row actions
if (isset($aExtraParams['row_actions'])) {
$oDataTable->SetRowActions($aExtraParams['row_actions']);
}
if (isset($aExtraParams['creation_in_modal_js_handler'])){
if (isset($aExtraParams['creation_in_modal_js_handler'])) {
$oDataTable->SetModalCreationHandler($aExtraParams['creation_in_modal_js_handler']);
}
return $oDataTable;
}