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

Make sure that 'source' nodes for ComputedImpactedItems are not added twice to the ticket.

Browse Source 
SVN:trunk[3571]
This commit is contained in:
Denis Flaven
2015-04-29 17:27:40 +00:00
parent d63b4ef6d1
commit af2835e505
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
View File

@@ -1373,6 +1373,8 @@
foreach($oIterator as $oNode) foreach($oIterator as $oNode)
{ {
if($oNode instanceof RelationObjectNode) if($oNode instanceof RelationObjectNode)
{
if ($oNode->GetProperty('is_reached') && (!$oNode->GetProperty('source')))
{ {
$oObj = $oNode->GetProperty('object'); $oObj = $oNode->GetProperty('object');
$sRootClass = MetaModel::GetRootClass(get_class($oObj)); $sRootClass = MetaModel::GetRootClass(get_class($oObj));
@@ -1382,6 +1384,7 @@
} }
$aComputed[$sRootClass][$oObj->GetKey()] = $oObj; $aComputed[$sRootClass][$oObj->GetKey()] = $oObj;
} }
}
} }
if (isset($aComputed['FunctionalCI']) && is_array($aComputed['FunctionalCI'])) if (isset($aComputed['FunctionalCI']) && is_array($aComputed['FunctionalCI']))

2
datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
View File

@@ -1376,7 +1376,7 @@
{ {
if($oNode instanceof RelationObjectNode) if($oNode instanceof RelationObjectNode)
{ {
if ($oNode->GetProperty('is_reached')) if ($oNode->GetProperty('is_reached') && (!$oNode->GetProperty('source')))
{ {
$oObj = $oNode->GetProperty('object'); $oObj = $oNode->GetProperty('object');
$sRootClass = MetaModel::GetRootClass(get_class($oObj)); $sRootClass = MetaModel::GetRootClass(get_class($oObj));