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

Rename all the attributes for navigation in list with basket

Browse Source
This commit is contained in:
acognet
2023-08-11 16:05:31 +02:00
parent 49cf6f5fe2
commit 0e76db8c93
33 changed files with 2763 additions and 2462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,10 @@ class DataTable extends UIContentBlock
protected $aAjaxData;
protected $aDisplayColumns;
protected $aResultColumns;
/* @since 3.1.1 */
protected $sBasketFilter;
/* @since 3.1.1 */
protected $sBasketClass;
/**
* @var string
*/
@@ -224,6 +227,7 @@ class DataTable extends UIContentBlock
/**
* @return string
* @since 3.1.1
*/
public function GetBasketFilter()
{
@@ -232,12 +236,33 @@ class DataTable extends UIContentBlock
/**
* @param string $sFilter
*
* @since 3.1.1
*/
public function setBasketFilter($sFilter): void
public function setBasketFilter(string $sFilter): void
{
$this->sBasketFilter = $sFilter;
}
/**
* @return mixed
* @since 3.1.1
*/
public function GetBasketClass()
{
return $this->sBasketClass;
}
/**
* @param string $sBasketClass
*
* @since 3.1.1
*/
public function setBasketClass(string $sBasketClass): void
{
$this->sBasketClass = $sBasketClass;
}
/**
* Get $aInitDisplayData
*

12
sources/Application/UI/Base/Component/DataTable/DataTableBasket.php
View File

@@ -16,7 +16,7 @@ use DataTableConfig;
* Class DataTableBasket
*
* @package Combodo\iTop\Application\UI\Base\Component\DataTableBasket
* @since 3.1.0
* @since 3.1.1
*/
class DataTableBasket extends UIContentBlock
{
@@ -25,24 +25,24 @@ class DataTableBasket extends UIContentBlock
public const DEFAULT_JS_ON_READY_TEMPLATE_REL_PATH = 'base/components/datatable/basket';
protected $sPostedFieldsForBackUrl;
protected $sBasketPostedFieldsForBackUrl;
/**
* Panel constructor.
*
*/
public function __construct(array $aPostedFieldsForBackUrl = [], ?string $sId = null)
public function __construct(array $aBasketPostedFieldsForBackUrl = [], ?string $sId = null)
{
parent::__construct($sId);
$this->sPostedFieldsForBackUrl = json_encode($aPostedFieldsForBackUrl);
$this->sBasketPostedFieldsForBackUrl = json_encode($aBasketPostedFieldsForBackUrl);
}
/**
* @return string
*/
public function GetPostedFieldsForBackUrl(): string
public function GetBasketPostedFieldsForBackUrl(): string
{
return $this->sPostedFieldsForBackUrl;
return $this->sBasketPostedFieldsForBackUrl;
}
}

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

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