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

N°642 Portal: Flags on transition part 3, forms inheritance for stimuli.

Browse Source 
SVN:trunk[4789]
This commit is contained in:
Guillaume Lajarige
2017-07-03 10:25:49 +00:00
parent 9a56c3acfd
commit 68885496dd
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -904,7 +904,7 @@ class ApplicationHelper
{
$sStimulusCode = $oStimulusNode->getAttribute('id');
// Removing default form is present (in case the default forms were parsed before the current one)
// Removing default form is present (in case the default forms were parsed before the current one (from current or parent class))
if(isset($aForms[$sFormClass]['apply_stimulus'][$sStimulusCode]))
{
unset($aForms[$sFormClass]['apply_stimulus'][$sStimulusCode]);
@@ -972,25 +972,6 @@ class ApplicationHelper
$aFields['fields'] = 'details';
}
// Adding stimuli if explicitly defined
if(in_array('apply_stimulus', $aModes))
{
// If stimuli are implicitly defined (empty tag), we define all those that have not already been by other forms.
if(empty($aFormStimuli))
{
// Stimuli already declared
$aDeclaredStimuli = array();
if(array_key_exists($sFormClass, $aForms) && array_key_exists('apply_stimulus', $aForms[$sFormClass]))
{
$aDeclaredStimuli = array_keys($aForms[$sFormClass]['apply_stimulus']);
}
// All stimuli
$aDatamodelStimuli = array_keys(MetaModel::EnumStimuli($sFormClass));
// Missing stimuli
$aFormStimuli = array_diff($aDatamodelStimuli, $aDeclaredStimuli);
}
}
// Parsing presentation
if ($oFormNode->GetOptionalElement('twig') !== null)
{
@@ -1008,6 +989,7 @@ class ApplicationHelper
// Adding form for each class / mode
foreach ($aModes as $sMode)
{
// Initializing current class if necessary
if (!isset($aForms[$sFormClass]))
{
$aForms[$sFormClass] = array();
@@ -1015,17 +997,38 @@ class ApplicationHelper
if ($sMode === 'apply_stimulus')
{
if(!isset($aForms[$sFormClass][$sMode]))
// Iterating over current class and child classes to fill stimuli forms
foreach (MetaModel::EnumChildClasses($sFormClass, ENUM_CHILD_CLASSES_ALL) as $sChildClass)
{
$aForms[$sFormClass][$sMode] = array();
}
foreach($aFormStimuli as $sFormStimulus)
{
if(!isset($aForms[$sFormClass][$sMode][$sFormStimulus]))
// Initializing child class if necessary
if(!isset($aForms[$sChildClass][$sMode]))
{
$aForms[$sFormClass][$sMode][$sFormStimulus] = $aFields;
$aForms[$sFormClass][$sMode][$sFormStimulus]['id'] = 'apply_stimulus-'.$sFormClass.'-'.$sFormStimulus;
$aForms[$sChildClass][$sMode] = array();
}
// If stimuli are implicitly defined (empty tag), we define all those that have not already been by other forms.
$aChildStimuli = $aFormStimuli;
if(empty($aChildStimuli))
{
// Stimuli already declared
$aDeclaredStimuli = array();
if(array_key_exists($sChildClass, $aForms) && array_key_exists('apply_stimulus', $aForms[$sChildClass]))
{
$aDeclaredStimuli = array_keys($aForms[$sChildClass]['apply_stimulus']);
}
// All stimuli
$aDatamodelStimuli = array_keys(MetaModel::EnumStimuli($sChildClass));
// Missing stimuli
$aChildStimuli = array_diff($aDatamodelStimuli, $aDeclaredStimuli);
}
foreach($aChildStimuli as $sFormStimulus)
{
if(!isset($aForms[$sChildClass][$sMode][$sFormStimulus]))
{
$aForms[$sChildClass][$sMode][$sFormStimulus] = $aFields;
$aForms[$sChildClass][$sMode][$sFormStimulus]['id'] = 'apply_stimulus-'.$sChildClass.'-'.$sFormStimulus;
}
}
}
}