composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-26 03:58:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some strange behavior

Browse Source
This commit is contained in:
acognet
2023-08-10 12:24:01 +02:00
parent b852e72088
commit 49cf6f5fe2
9 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ class DataTable extends UIContentBlock
protected $aAjaxData;
protected $aDisplayColumns;
protected $aResultColumns;
protected $sFilter;
protected $sBasketFilter;
/**
* @var string
*/
@@ -225,17 +225,17 @@ class DataTable extends UIContentBlock
/**
* @return string
*/
public function GetFilter()
public function GetBasketFilter()
{
return $this->sFilter;
return $this->sBasketFilter;
}
/**
* @param string $sFilter
*/
public function setFilter($sFilter): void
public function setBasketFilter($sFilter): void
{
$this->sFilter = $sFilter;
$this->sBasketFilter = $sFilter;
}
/**

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

@@ -596,7 +596,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$oDataTable->SetDisplayColumns($aColumnDefinition);
$oDataTable->SetResultColumns($oCustomSettings->aColumns);
$oFilter->SetSelectedClasses([$sBasketAliasClass]);
$oDataTable->SetFilter($oFilter->ToOQL(true));
$oDataTable->SetBasketFilter($oFilter->ToOQL(true));
$oDataTable->SetInitDisplayData(AjaxRenderController::GetDataForTable($oSet, $aClassAliases, $aColumnsToLoad, $sIdName, $aExtraParams, 1, $sLinkToBasket));
// row actions