N°3123 - Changed the variables in application UIBlocks

This commit is contained in:
Eric
2020-12-01 19:08:49 +01:00
parent c701b518b8
commit abb192eb0f
12 changed files with 85 additions and 99 deletions

View File

@@ -7,7 +7,6 @@
namespace Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChart;
use Combodo\iTop\Application\UI\tBlockParams;
use Combodo\iTop\Application\UI\UIBlock;
/**
@@ -22,5 +21,10 @@ class BlockChart extends UIBlock
public const HTML_TEMPLATE_REL_PATH = 'specific/displayblock/blockchart/layout';
public const JS_TEMPLATE_REL_PATH = 'specific/displayblock/blockchart/layout';
use tBlockParams;
/** @var int */
public $iChartCounter;
/** @var string */
public $sId;
/** @var string */
public $sUrl;
}

View File

@@ -7,7 +7,6 @@
namespace Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChartAjaxBars;
use Combodo\iTop\Application\UI\tBlockParams;
use Combodo\iTop\Application\UI\UIBlock;
/**
@@ -21,5 +20,12 @@ class BlockChartAjaxBars extends UIBlock
public const BLOCK_CODE = 'ibo-blockchartajaxbars';
public const JS_TEMPLATE_REL_PATH = 'specific/displayblock/blockchartajaxbars/layout';
use tBlockParams;
/** @var string */
public $sJSNames;
/** @var string */
public $sJson;
/** @var string */
public $sId;
/** @var string */
public $sJSURLs;
}

View File

@@ -7,7 +7,6 @@
namespace Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockChartAjaxPie;
use Combodo\iTop\Application\UI\tBlockParams;
use Combodo\iTop\Application\UI\UIBlock;
/**
@@ -21,5 +20,12 @@ class BlockChartAjaxPie extends UIBlock
public const BLOCK_CODE = 'ibo-blockchartajaxpie';
public const JS_TEMPLATE_REL_PATH = 'specific/displayblock/blockchartajaxpie/layout';
use tBlockParams;
/** @var string */
public $sId;
/** @var string */
public $sJSColumns;
/** @var string */
public $sJSURLs;
/** @var string */
public $sJSNames;
}

View File

@@ -8,7 +8,6 @@ namespace Combodo\iTop\Application\UI\Specific\DisplayBlock\BlockList;
use Combodo\iTop\Application\UI\Layout\UIContentBlock;
use Combodo\iTop\Application\UI\tBlockParams;
/**
* Class BlockList
@@ -22,5 +21,20 @@ class BlockList extends UIContentBlock
public const HTML_TEMPLATE_REL_PATH = 'specific/displayblock/blocklist/layout';
public const JS_TEMPLATE_REL_PATH = 'specific/displayblock/blocklist/layout';
use tBlockParams;
/** @var bool */
public $bEmptySet = false;
/** @var bool */
public $bNotAuthorized = false;
/** @var bool */
public $bCreateNew = false;
/** @var string */
public $sLinkTarget = '';
/** @var string */
public $sClass = '';
/** @var string */
public $sParams = '';
/** @var string */
public $sDefault = '';
/** @var string */
public $sEventAttachedData = '';
}

View File

@@ -1,23 +0,0 @@
<?php
/**
* @copyright Copyright (C) 2010-2020 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Application\Specific\DisplayBlock;
use Combodo\iTop\Application\UI\iUIBlock;
use DBSearch;
use DisplayBlock;
use WebPage;
class DisplayBlockFactory
{
public static function GetUIBlockForList(DBSearch $oFilter, WebPage $oPage, $sId, $aFilterParams = array(), $aExtraParams = array()): iUIBlock
{
$oDisplayBlock = new DisplayBlock($oFilter, 'list', false, $aFilterParams);
return $oDisplayBlock->GetDisplay($oPage, $sId, $aExtraParams);
}
}