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

N°2847 - Datatables WIP

Browse Source
This commit is contained in:
Eric
2020-11-16 15:02:02 +01:00
parent 89c35f0345
commit 4c78ecab91
6 changed files with 181 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sources/application/UI/Component/DataTable/DataTableFactory.php
View File

@@ -7,20 +7,21 @@
namespace Combodo\iTop\Application\UI\Component\DataTable;
use ApplicationException;
use appUserPreferences;
use AttributeLinkedSet;
use CMDBObjectSet;
use cmdbAbstractObject;
use CMDBObjectSet;
use Combodo\iTop\Application\UI\Component\DataTable\StaticTable\FormTable\FormTable;
use Combodo\iTop\Application\UI\Component\DataTable\StaticTable\StaticTable;
use Combodo\iTop\Application\UI\Component\Panel\PanelFactory;
use Combodo\iTop\Application\UI\Component\Title\TitleFactory;
use MetaModel;
use appUserPreferences;
use UserRights;
use MenuBlock;
use Combodo\iTop\Application\UI\Layout\UIContentBlock;
use WebPage;
use DBObjectSet;
use Dict;
use MenuBlock;
use MetaModel;
use UserRights;
use WebPage;
/**
* Class DataTableFactory
@@ -67,7 +68,7 @@ class DataTableFactory
/**
* @param \WebPage $oPage
* @param string $sListId
* @param \CMDBObjectSet $oSet
* @param DBObjectSet $oSet
* @param array $aExtraParams
*
* @return \Combodo\iTop\Application\UI\Component\Panel\Panel
@@ -81,7 +82,7 @@ class DataTableFactory
* @throws \OQLException
* @throws \ReflectionException
*/
public static function MakeForObject(WebPage $oPage, string $sListId, CMDBObjectSet $oSet, $aExtraParams = array())
public static function MakeForObject(WebPage $oPage, string $sListId, DBObjectSet $oSet, $aExtraParams = array())
{
$oPanel = PanelFactory::MakeForClass($oSet->GetClass(), "Result");
$oDataTable = DataTableFactory::MakeForRenderingObject($sListId, $oSet, $aExtraParams);
@@ -345,7 +346,7 @@ class DataTableFactory
/**
* @param string $sListId
* @param \CMDBObjectSet $oSet
* @param DBObjectSet $oSet
* @param array $aExtraParams
*
* @return \Combodo\iTop\Application\UI\Component\DataTable\DataTableBlock
@@ -355,7 +356,7 @@ class DataTableFactory
* @throws \DictExceptionMissingString
* @throws \MySQLException
*/
public static function MakeForRenderingObject(string $sListId, CMDBObjectSet $oSet, $aExtraParams = array())
public static function MakeForRenderingObject(string $sListId, DBObjectSet $oSet, $aExtraParams = array())
{
$oDataTable = new DataTableBlock('datatable_'.$sListId);
$aList = array();
@@ -476,6 +477,7 @@ class DataTableFactory
if($sSelectMode!="") {
$iIndexColumn++;
}
$aSortDatable = [];
foreach ($aClassAliases as $sClassAlias => $sClassName) {
foreach ($oCustomSettings->aColumns[$sClassAlias] as $sAttCode => $aData) {
if ($aData['sort'] != 'none') {