From c27cafb02f54e632c0ffe3c95b9855a2062ffa35 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Fri, 28 Jul 2017 15:01:51 +0000 Subject: [PATCH] =?UTF-8?q?N=C2=B0642=20Portal:=20Fixed=20bug=20in=20new?= =?UTF-8?q?=20stimulus=20form=20algorithm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SVN:trunk[4849] --- .../portal/src/helpers/applicationhelper.class.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php index 0d8d980918..447d7f7381 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php @@ -957,6 +957,7 @@ class ApplicationHelper if ($oModeNode->getAttribute('id') === 'apply_stimulus') { $oStimuliNode = $oModeNode->GetOptionalElement('stimuli'); + // if stimuli are defined, we overwrite the form that could have been set by the generic form if($oStimuliNode !== null) { foreach ($oStimuliNode->GetNodes('stimulus') as $oStimulusNode) @@ -1083,7 +1084,8 @@ class ApplicationHelper foreach($aChildStimuli as $sFormStimulus) { - if(!isset($aForms[$sChildClass][$sMode][$sFormStimulus])) + // Setting form if not defined OR if it was defined by a parent (abstract) class + if(!isset($aForms[$sChildClass][$sMode][$sFormStimulus]) || !empty($aFormStimuli)) { $aForms[$sChildClass][$sMode][$sFormStimulus] = $aFields; $aForms[$sChildClass][$sMode][$sFormStimulus]['id'] = 'apply_stimulus-'.$sChildClass.'-'.$sFormStimulus;