composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 15:34:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.0' into develop

Browse Source 
# Conflicts:
#	application/applicationextension.inc.php
This commit is contained in:
Eric Espie
2022-12-29 14:40:26 +01:00
parent 0fad249124 5fe32aac15
commit f3cea730af
25 changed files with 321 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,8 @@
namespace Combodo\iTop\Application\UI\Base\Component\DataTable;
use ApplicationException;
use ApplicationContext;
use ApplicationException;
use appUserPreferences;
use AttributeLinkedSet;
use cmdbAbstractObject;
@@ -38,9 +38,9 @@ use WebPage;
* Class DataTableUIBlockFactory
*
* @author Anne-Catherine Cognet <anne-catherine.cognet@combodo.com>
* @package Combodo\iTop\Application\UI\Base\Component\DataTable
* @since 3.0.0
* @package UIBlockExtensibilityAPI
* @api
* @since 3.0.0
*/
class DataTableUIBlockFactory extends AbstractUIBlockFactory
{
@@ -50,6 +50,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
public const UI_BLOCK_CLASS_NAME = DataTable::class;
/**
* @api
* @param \WebPage $oPage
* @param string $sListId
* @param \DBObjectSet $oSet
@@ -74,6 +75,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
}
/**
* @api
* @param \WebPage $oPage
* @param string $sListId
* @param DBObjectSet $oSet
@@ -225,6 +227,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
/**
* Make a basis Panel component
*
* @api
* @param string $sListId
* @param \DBObjectSet $oSet
* @param array $aExtraParams
@@ -525,6 +528,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
}
/**
* @api
* @param string $sListId
* @param DBObjectSet $oSet
* @param array $aExtraParams
@@ -773,7 +777,9 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
* @param string $sSelectMode
* @param string $sFilter
* @param int $iLength
* @param array $aClassAliases
* @param array $aExtraParams
* @param string $sTableId
*
* @return array
* @throws \Exception
@@ -953,6 +959,7 @@ JS;
}
/**
* @api
* @param string $sTitle
* @param array $aColumns
* @param array $aData
@@ -996,6 +1003,7 @@ JS;
}
/**
* @api
* @param string $sRef
* @param array $aColumns
* @param array $aData