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

N°642 Portal: Fixed bug in new stimulus form algorithm

Browse Source 
SVN:trunk[4849]
This commit is contained in:
Guillaume Lajarige
2017-07-28 15:01:51 +00:00
parent 09a2dbc185
commit c27cafb02f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
View File

@@ -957,6 +957,7 @@ class ApplicationHelper
if ($oModeNode->getAttribute('id') === 'apply_stimulus') if ($oModeNode->getAttribute('id') === 'apply_stimulus')
{ {
$oStimuliNode = $oModeNode->GetOptionalElement('stimuli'); $oStimuliNode = $oModeNode->GetOptionalElement('stimuli');
// if stimuli are defined, we overwrite the form that could have been set by the generic form
if($oStimuliNode !== null) if($oStimuliNode !== null)
{ {
foreach ($oStimuliNode->GetNodes('stimulus') as $oStimulusNode) foreach ($oStimuliNode->GetNodes('stimulus') as $oStimulusNode)
@@ -1083,7 +1084,8 @@ class ApplicationHelper
foreach($aChildStimuli as $sFormStimulus) 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] = $aFields;
$aForms[$sChildClass][$sMode][$sFormStimulus]['id'] = 'apply_stimulus-'.$sChildClass.'-'.$sFormStimulus; $aForms[$sChildClass][$sMode][$sFormStimulus]['id'] = 'apply_stimulus-'.$sChildClass.'-'.$sFormStimulus;