diff --git a/core/dbobjectset.class.php b/core/dbobjectset.class.php index f6d440136..47be015c5 100644 --- a/core/dbobjectset.class.php +++ b/core/dbobjectset.class.php @@ -53,6 +53,18 @@ class DBObjectSet implements iDBObjectSetIterator * @var array */ protected $m_aAttToLoad; + /** + * @var null|array + */ + protected $m_aExtendedDataSpec; + /** + * @var int Maximum number of elements to retrieve + */ + protected $m_iLimitCount; + /** + * @var int Offset from which elements should be retrieved + */ + protected $m_iLimitStart; /** * @var array */ diff --git a/sources/Application/UI/Base/Component/DataTable/DataTable.php b/sources/Application/UI/Base/Component/DataTable/DataTable.php index a43fb7248..e57e515fc 100644 --- a/sources/Application/UI/Base/Component/DataTable/DataTable.php +++ b/sources/Application/UI/Base/Component/DataTable/DataTable.php @@ -48,6 +48,10 @@ class DataTable extends UIContentBlock protected $aAjaxData; protected $aDisplayColumns; protected $aResultColumns; + /** + * @var string + */ + protected $sJsonData; /* * array of data to display the first page */ diff --git a/sources/Application/UI/Base/Component/DataTable/DataTableSettings.php b/sources/Application/UI/Base/Component/DataTable/DataTableSettings.php index ccd3e8ed4..49ae0b446 100644 --- a/sources/Application/UI/Base/Component/DataTable/DataTableSettings.php +++ b/sources/Application/UI/Base/Component/DataTable/DataTableSettings.php @@ -12,12 +12,35 @@ use Dict; use Metamodel; use Serializable; +/** + * Class DataTableSettings + * + * @author Anne-Catherine Cognet + * @package Combodo\iTop\Application\UI\Base\Component\DataTable + * @since 3.0.0 + */ class DataTableSettings { + /** + * @var array + */ public $aClassAliases; + /** + * @var null|string + */ public $sTableId; + /** + * @var int + */ public $iDefaultPageSize; + /** + * @var array + */ public $aColumns; + /** + * @var array + */ + public $aSortOrder; /** diff --git a/sources/Application/UI/DisplayBlock/BlockList/BlockList.php b/sources/Application/UI/DisplayBlock/BlockList/BlockList.php index b1b129064..d10650e21 100644 --- a/sources/Application/UI/DisplayBlock/BlockList/BlockList.php +++ b/sources/Application/UI/DisplayBlock/BlockList/BlockList.php @@ -42,6 +42,8 @@ class BlockList extends UIContentBlock public $sDefault = ''; /** @var string */ public $sEventAttachedData = ''; + /** @var string */ + public $sAbsoluteUrlAppRoot; /** @var array */ public $aExtraParams; /** @var string */