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

Fixed a regression introduced by #930: a field can depend on a hidden fields, but this has no visible effect.

Browse Source 
SVN:trunk[3210]
This commit is contained in:
Denis Flaven
2014-06-13 09:10:17 +00:00
parent 6b86ac5090
commit e78743d309
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/cmdbabstract.class.inc.php
View File

@@ -2494,6 +2494,12 @@ EOF
// Dependency is resolved, remove it
unset($aFields[$sFieldCode][$key]);
}
else if (!array_key_exists($sDependency, $aFields))
{
// The current fields depends on a field not present in the form
// let's ignore it (since it cannot change)
unset($aFields[$sFieldCode][$key]);
}
}
if (count($aFields[$sFieldCode]) == 0)
{
@@ -2508,7 +2514,7 @@ EOF
if (count($aFields) > 0)
{
$sMessage = "Error: Circular dependencies between the fields (or field missing in ZList) ! <pre>".print_r($aFields, true)."</pre>";
$sMessage = "Error: Circular dependencies between the fields! <pre>".print_r($aFields, true)."</pre>";
throw(new Exception($sMessage));
}
return $aResult;