composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-18 16:18:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1192 Fix transition form always redirecting to object no matter the navigation rule

Browse Source
This commit is contained in:
Molkobain
2019-11-27 17:18:17 +01:00
parent 603ae8c0e1
commit 20683fdf50
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js
View File

@@ -181,7 +181,7 @@ $(function()
$('body').trigger('unregister_blocker.portal.itop', {'sBlockerId': me.element.attr('id')});
// Checking if we have to redirect to another page
// Typically this happens when applying a stimulus, we redirect to transition form
// Typically this happens when applying a stimulus, we redirect to the transition form
if(oValidation.redirection !== undefined)
{
var oRedirection = oValidation.redirection;

13
datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
View File

@@ -370,6 +370,8 @@ class ObjectController extends BrickController
$oRequestManipulator = $this->get('request_manipulator');
/** @var \Combodo\iTop\Portal\Routing\UrlGenerator $oUrlGenerator */
$oUrlGenerator = $this->get('url_generator');
/** @var \Combodo\iTop\Portal\Helper\NavigationRuleHelper $oNavigationRuleHelper */
$oNavigationRuleHelper = $this->get('navigation_rule_helper');
/** @var \Combodo\iTop\Portal\Helper\ObjectFormHandlerHelper $oObjectFormHandler */
$oObjectFormHandler = $this->get('object_form_handler');
/** @var \Combodo\iTop\Portal\Helper\SecurityHelper $oSecurityHelper */
@@ -431,9 +433,6 @@ class ObjectController extends BrickController
$aData = array('sMode' => 'apply_stimulus');
$aData['form'] = $oObjectFormHandler->HandleForm($oRequest, $aData['sMode'], $sObjectClass, $sObjectId, $aFormProperties);
$aData['form']['title'] = Dict::Format('Brick:Portal:Object:Form:Stimulus:Title');
$aData['form']['validation']['redirection'] = array(
'url' => $oUrlGenerator->generate('p_object_edit', array('sObjectClass' => $sObjectClass, 'sObjectId' => $sObjectId)),
);
// TODO : This is a ugly patch to avoid showing a modal with a readonly form to the user as it would prevent user from finishing the transition.
// Instead, we apply the stimulus directly here and then go to the edited object.
@@ -450,12 +449,16 @@ class ObjectController extends BrickController
$aData = array('sMode' => 'apply_stimulus');
$aData['form'] = $oObjectFormHandler->HandleForm($oSubRequest, $aData['sMode'], $sObjectClass, $sObjectId,
$aFormProperties);
// Reload the object to make sure we have it in a clean state
$oObject->Reload(true);
$aNavigationRules = $oNavigationRuleHelper->PrepareRulesForForm($aFormProperties, $oObject, true);
// Redefining the array to be as simple as possible :
$aData = array(
'redirection' =>
array(
'url' => $oUrlGenerator->generate('p_object_edit',
array('sObjectClass' => $sObjectClass, 'sObjectId' => $sObjectId)),
'url' => $aNavigationRules['submit']['url'],
),
);
}