composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6933 - SF 6.4 - Remove deprecated calls

Browse Source 
- BrowseBrickController (services access)
This commit is contained in:
Benjamin Dalsass
2023-11-20 15:54:21 +01:00
parent c0b1e877ad
commit 71ef74e211
1 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
datamodels/2.x/itop-portal-base/portal/src/Controller/BrowseBrickController.php
View File

@@ -24,8 +24,11 @@ use AttributeExternalKey;
use AttributeLinkedSetIndirect; use AttributeLinkedSetIndirect;
use BinaryExpression; use BinaryExpression;
use Combodo\iTop\Portal\Brick\AbstractBrick; use Combodo\iTop\Portal\Brick\AbstractBrick;
use Combodo\iTop\Portal\Brick\BrickCollection;
use Combodo\iTop\Portal\Brick\BrowseBrick; use Combodo\iTop\Portal\Brick\BrowseBrick;
use Combodo\iTop\Portal\Helper\BrickControllerHelper;
use Combodo\iTop\Portal\Helper\BrowseBrickHelper; use Combodo\iTop\Portal\Helper\BrowseBrickHelper;
use Combodo\iTop\Portal\Helper\RequestManipulatorHelper;
use DBObjectSearch; use DBObjectSearch;
use DBObjectSet; use DBObjectSet;
use DBSearch; use DBSearch;
@@ -48,6 +51,26 @@ use VariableExpression;
*/ */
class BrowseBrickController extends BrickController class BrowseBrickController extends BrickController
{ {
/**
* Constructor.
*
* @param \Combodo\iTop\Portal\Helper\BrowseBrickHelper $oBrowseBrickHelper
* @param \Combodo\iTop\Portal\Helper\RequestManipulatorHelper $oRequestManipulator
* @param \Combodo\iTop\Portal\Helper\BrickControllerHelper $oBrickControllerHelper
* @param \Combodo\iTop\Portal\Brick\BrickCollection $oBrickCollection
*/
public function __construct(
protected BrowseBrickHelper $oBrowseBrickHelper,
protected RequestManipulatorHelper $oRequestManipulator,
protected BrickControllerHelper $oBrickControllerHelper,
protected BrickCollection $oBrickCollection
)
{
}
/** /**
* @param \Symfony\Component\HttpFoundation\Request $oRequest * @param \Symfony\Component\HttpFoundation\Request $oRequest
* @param string $sBrickId * @param string $sBrickId
@@ -69,15 +92,8 @@ class BrowseBrickController extends BrickController
{ {
$sPortalId = $this->getParameter('combodo.portal.instance.id'); $sPortalId = $this->getParameter('combodo.portal.instance.id');
/** @var \Combodo\iTop\Portal\Helper\BrowseBrickHelper $oBrowseBrickHelper */
$oBrowseBrickHelper = $this->get('browse_brick');
/** @var \Combodo\iTop\Portal\Helper\RequestManipulatorHelper $oRequestManipulator */
$oRequestManipulator = $this->get('request_manipulator');
/** @var \Combodo\iTop\Portal\Helper\BrickControllerHelper */
$oBrickControllerHelper = $this->get('brick_controller_helper');
/** @var \Combodo\iTop\Portal\Brick\BrowseBrick $oBrick */ /** @var \Combodo\iTop\Portal\Brick\BrowseBrick $oBrick */
$oBrick = $this->get('brick_collection')->getBrickById($sBrickId); $oBrick = $this->oBrickCollection->getBrickById($sBrickId);
// Getting available browse modes // Getting available browse modes
$aBrowseModes = $oBrick->GetAvailablesBrowseModes(); $aBrowseModes = $oBrick->GetAvailablesBrowseModes();
@@ -85,10 +101,10 @@ class BrowseBrickController extends BrickController
// Getting current browse mode (First from router parameter, then default brick value) // Getting current browse mode (First from router parameter, then default brick value)
$sBrowseMode = (!empty($sBrowseMode)) ? $sBrowseMode : $oBrick->GetDefaultBrowseMode(); $sBrowseMode = (!empty($sBrowseMode)) ? $sBrowseMode : $oBrick->GetDefaultBrowseMode();
// Getting current dataloading mode (First from router parameter, then query parameter, then default brick value) // Getting current dataloading mode (First from router parameter, then query parameter, then default brick value)
$sDataLoading = ($sDataLoading !== null) ? $sDataLoading : $oRequestManipulator->ReadParam('sDataLoading', $sDataLoading = ($sDataLoading !== null) ? $sDataLoading : $this->oRequestManipulator->ReadParam('sDataLoading',
$oBrick->GetDataLoading()); $oBrick->GetDataLoading());
// Getting search value // Getting search value
$sRawSearchValue = $oRequestManipulator->ReadParam('sSearchValue', ''); $sRawSearchValue = $this->oRequestManipulator->ReadParam('sSearchValue', '');
$sSearchValue = html_entity_decode($sRawSearchValue); $sSearchValue = html_entity_decode($sRawSearchValue);
if (strlen($sSearchValue) > 0) if (strlen($sSearchValue) > 0)
{ {
@@ -98,7 +114,7 @@ class BrowseBrickController extends BrickController
$aData = array(); $aData = array();
$aLevelsProperties = array(); $aLevelsProperties = array();
$aLevelsClasses = array(); $aLevelsClasses = array();
$oBrowseBrickHelper->TreeToFlatLevelsProperties($oBrick->GetLevels(), $aLevelsProperties); $this->oBrowseBrickHelper->TreeToFlatLevelsProperties($oBrick->GetLevels(), $aLevelsProperties);
// Consistency checks // Consistency checks
if (!in_array($sBrowseMode, array_keys($aBrowseModes))) if (!in_array($sBrowseMode, array_keys($aBrowseModes)))
@@ -298,8 +314,8 @@ class BrowseBrickController extends BrickController
{ {
case BrowseBrick::ENUM_BROWSE_MODE_LIST: case BrowseBrick::ENUM_BROWSE_MODE_LIST:
// Retrieving parameters // Retrieving parameters
$iPageNumber = (int)$oRequestManipulator->ReadParam('iPageNumber', 1, FILTER_SANITIZE_NUMBER_INT); $iPageNumber = (int)$this->oRequestManipulator->ReadParam('iPageNumber', 1, FILTER_SANITIZE_NUMBER_INT);
$iListLength = (int)$oRequestManipulator->ReadParam('iListLength', BrowseBrick::DEFAULT_LIST_LENGTH, $iListLength = (int)$this->oRequestManipulator->ReadParam('iListLength', BrowseBrick::DEFAULT_LIST_LENGTH,
FILTER_SANITIZE_NUMBER_INT); FILTER_SANITIZE_NUMBER_INT);
// Getting total records number // Getting total records number
@@ -315,8 +331,8 @@ class BrowseBrickController extends BrickController
case BrowseBrick::ENUM_BROWSE_MODE_TREE: case BrowseBrick::ENUM_BROWSE_MODE_TREE:
case BrowseBrick::ENUM_BROWSE_MODE_MOSAIC: case BrowseBrick::ENUM_BROWSE_MODE_MOSAIC:
// Retrieving parameters // Retrieving parameters
$sLevelAlias = $oRequestManipulator->ReadParam('sLevelAlias', ''); $sLevelAlias = $this->oRequestManipulator->ReadParam('sLevelAlias', '');
$sNodeId = $oRequestManipulator->ReadParam('sNodeId', ''); $sNodeId = $this->oRequestManipulator->ReadParam('sNodeId', '');
// If no values for those parameters, we might be loading page in lazy mode for the first time, therefore the URL doesn't have those information. // If no values for those parameters, we might be loading page in lazy mode for the first time, therefore the URL doesn't have those information.
if (empty($sLevelAlias)) if (empty($sLevelAlias))
@@ -415,7 +431,7 @@ class BrowseBrickController extends BrickController
$oSet->OptimizeColumnLoad($aColumnAttrs); $oSet->OptimizeColumnLoad($aColumnAttrs);
// Setting specified column sort, setting default datamodel one otherwise // Setting specified column sort, setting default datamodel one otherwise
$aSortedParams = $oBrickControllerHelper->ExtractSortParams(); $aSortedParams = $this->oBrickControllerHelper->ExtractSortParams();
if (!empty($aSortedParams)) if (!empty($aSortedParams))
{ {
$oSet->SetOrderBy($aSortedParams); $oSet->SetOrderBy($aSortedParams);
@@ -432,12 +448,12 @@ class BrowseBrickController extends BrickController
{ {
case BrowseBrick::ENUM_BROWSE_MODE_TREE: case BrowseBrick::ENUM_BROWSE_MODE_TREE:
case BrowseBrick::ENUM_BROWSE_MODE_MOSAIC: case BrowseBrick::ENUM_BROWSE_MODE_MOSAIC:
$oBrowseBrickHelper->AddToTreeItems($aItems, $aCurrentRow, $aLevelsProperties, null); $this->oBrowseBrickHelper->AddToTreeItems($aItems, $aCurrentRow, $aLevelsProperties, null);
break; break;
case BrowseBrick::ENUM_BROWSE_MODE_LIST: case BrowseBrick::ENUM_BROWSE_MODE_LIST:
default: default:
$aItems[] = $oBrowseBrickHelper->AddToFlatItems($aCurrentRow, $aLevelsProperties); $aItems[] = $this->oBrowseBrickHelper->AddToFlatItems($aCurrentRow, $aLevelsProperties);
break; break;
} }
} }