mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-26 03:58:45 +02:00
N°5281 - Portal: Add method to declare brick controller since Symfony 5.4 migration (#313)
* Add controllers declaration interface to ItopExtensionsExtraRoutes * N°3390 - Upgrade from Symfony 3.4 to Symfony 5.4 Container setter issues * Show Symfony original error page when app debug is on * Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update datamodels/2.x/itop-portal-base/portal/src/Routing/ItopExtensionsExtraRoutes.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
This commit is contained in:
@@ -589,6 +589,8 @@ class ObjectController extends BrickController
|
||||
$oSecurityHelper = $this->get('security_helper');
|
||||
/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeValidator */
|
||||
$oScopeValidator = $this->get('scope_validator');
|
||||
/** @var \Combodo\iTop\Portal\Helper\ObjectFormHandlerHelper $oFormHandlerHelper */
|
||||
$oFormHandlerHelper = $this->get('object_form_handler');
|
||||
|
||||
$aData = array(
|
||||
'results' => array(
|
||||
@@ -640,16 +642,14 @@ class ObjectController extends BrickController
|
||||
// Updating host object with form data / values
|
||||
$sFormManagerClass = $aRequestContent['formmanager_class'];
|
||||
$sFormManagerData = $aRequestContent['formmanager_data'];
|
||||
if (!empty($sFormManagerClass) && !empty($sFormManagerData))
|
||||
{
|
||||
if (!empty($sFormManagerClass) && !empty($sFormManagerData)) {
|
||||
/** @var \Combodo\iTop\Portal\Form\ObjectFormManager $oFormManager */
|
||||
$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
|
||||
$oFormManager->SetContainer($this->container);
|
||||
$oFormManager->SetObjectFormHandlerHelper($oFormHandlerHelper);
|
||||
$oFormManager->SetObject($oHostObject);
|
||||
|
||||
// Applying action rules if present
|
||||
if (($oFormManager->GetActionRulesToken() !== null) && ($oFormManager->GetActionRulesToken() !== ''))
|
||||
{
|
||||
if (($oFormManager->GetActionRulesToken() !== null) && ($oFormManager->GetActionRulesToken() !== '')) {
|
||||
$aActionRules = ContextManipulatorHelper::DecodeRulesToken($oFormManager->GetActionRulesToken());
|
||||
$oObj = $oFormManager->GetObject();
|
||||
$oContextManipulator->PrepareObject($aActionRules, $oObj);
|
||||
@@ -769,13 +769,14 @@ class ObjectController extends BrickController
|
||||
$oSecurityHelper = $this->get('security_helper');
|
||||
/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeValidator */
|
||||
$oScopeValidator = $this->get('scope_validator');
|
||||
|
||||
/** @var \Combodo\iTop\Portal\Helper\ObjectFormHandlerHelper $oFormHandlerHelper */
|
||||
$oFormHandlerHelper = $this->get('object_form_handler');
|
||||
|
||||
$aData = array(
|
||||
'sMode' => 'search_regular',
|
||||
'sTargetAttCode' => $sTargetAttCode,
|
||||
'sHostObjectClass' => $sHostObjectClass,
|
||||
'sHostObjectId' => $sHostObjectId,
|
||||
'sMode' => 'search_regular',
|
||||
'sTargetAttCode' => $sTargetAttCode,
|
||||
'sHostObjectClass' => $sHostObjectClass,
|
||||
'sHostObjectId' => $sHostObjectId,
|
||||
'sActionRulesToken' => $oRequestManipulator->ReadParam('ar_token', ''),
|
||||
);
|
||||
|
||||
@@ -807,16 +808,14 @@ class ObjectController extends BrickController
|
||||
// Updating host object with form data / values
|
||||
$sFormManagerClass = $oRequestManipulator->ReadParam('formmanager_class', '', FILTER_UNSAFE_RAW);
|
||||
$sFormManagerData = $oRequestManipulator->ReadParam('formmanager_data', '', FILTER_UNSAFE_RAW);
|
||||
if (!empty($sFormManagerClass) && !empty($sFormManagerData))
|
||||
{
|
||||
if (!empty($sFormManagerClass) && !empty($sFormManagerData)) {
|
||||
/** @var \Combodo\iTop\Portal\Form\ObjectFormManager $oFormManager */
|
||||
$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
|
||||
$oFormManager->SetContainer($this->container);
|
||||
$oFormManager->SetObjectFormHandlerHelper($oFormHandlerHelper);
|
||||
$oFormManager->SetObject($oHostObject);
|
||||
|
||||
// Applying action rules if present
|
||||
if (($oFormManager->GetActionRulesToken() !== null) && ($oFormManager->GetActionRulesToken() !== ''))
|
||||
{
|
||||
if (($oFormManager->GetActionRulesToken() !== null) && ($oFormManager->GetActionRulesToken() !== '')) {
|
||||
$aActionRules = ContextManipulatorHelper::DecodeRulesToken($oFormManager->GetActionRulesToken());
|
||||
$oObj = $oFormManager->GetObject();
|
||||
$oContextManipulator->PrepareObject($aActionRules, $oObj);
|
||||
|
||||
Reference in New Issue
Block a user