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

N°3914 - Polishing: Lists - fix display of datatable and rename attribute for init data

Browse Source
This commit is contained in:
acognet
2021-08-26 11:36:14 +02:00
parent 2f5a1c99a5
commit 7f37c5912a
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sources/application/UI/Base/Component/DataTable/DataTable.php
View File

@@ -44,7 +44,10 @@ class DataTable extends UIContentBlock
protected $aAjaxData;
protected $aDisplayColumns;
protected $aResultColumns;
protected $sJsonData;
/*
* array of data to display the first page
*/
protected $aInitDisplayData;
/**
* Panel constructor.
@@ -101,6 +104,7 @@ class DataTable extends UIContentBlock
}
/**
* Get $aAjaxData as a JSON
* @return mixed
*/
public function GetJsonAjaxData(): string
@@ -179,11 +183,21 @@ class DataTable extends UIContentBlock
}
/**
* Get $aInitDisplayData as a JSON This is data of first page
* @return string
*/
public function GetJsonData(): string
public function GetJsonInitDisplayData(): string
{
return $this->sJsonData;
return json_encode($this->aInitDisplayData);
}
/**
* Get $aInitDisplayData
* @return array
*/
public function GetInitDisplayData(): array
{
return $this->aInitDisplayData;
}
/**
@@ -191,9 +205,9 @@ class DataTable extends UIContentBlock
*
* @return $this
*/
public function SetJsonData(string $sJSON)
public function SetInitDisplayData(array $aData)
{
$this->sJsonData = $sJSON;
$this->aInitDisplayData = $aData;
return $this;
}