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

Form : Fixed dependancies check in Form::Finalize()

Browse Source 
SVN:trunk[3955]
This commit is contained in:
Guillaume Lajarige
2016-03-17 15:25:33 +00:00
parent c201ae4147
commit af87ef3623
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sources/form/form.class.inc.php
View File

@@ -406,14 +406,26 @@ class Form
// Clone the dependency data : $aDependencies will be truncated as the fields are added to the list
$aDependencies = $this->aDependencies;
$bMadeProgress = true; // Safety net in case of circular references
foreach ($aDependencies as $sImpactedBy => $aSomeFields)
{
foreach ($aSomeFields as $i => $sSomeId)
{
if (!array_key_exists($sSomeId, $this->aFields))
{
throw new Exception('Missing dependancy : Field ' . $sImpactedBy . ' expecting field ' . $sSomeId . ' which is not in the Form');
}
}
}
while ($bMadeProgress && count($aFieldList) < count($this->aFields))
{
$bMadeProgress = false;
foreach ($this->aFields as $sId => $oField)
{
if (array_key_exists($sId, $aFieldList)) continue;
if (array_key_exists($sId, $aFieldList))
continue;
if (isset($aDependencies[$sId]) && count($aDependencies[$sId]) > 0) continue;
// Add the field at the end of the list
$aFieldList[$sId] = $oField;
$bMadeProgress = true;
@@ -433,7 +445,7 @@ class Form
}
if (!$bMadeProgress)
{
throw new Exception('Unmet dependencies: '.implode(', ', array_keys($aDependencies)));
throw new Exception('Unmet dependencies (might be a circular reference) : ' . implode(', ', array_keys($aDependencies)));
}
foreach ($aFieldList as $sId => $oField)
{