Pārlūkot izejas kodu

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

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3571 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 10 gadi atpakaļ
vecāks
revīzija
4fa6ce55c4

+ 8 - 5
datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml

@@ -1374,13 +1374,16 @@
         {
             if($oNode instanceof RelationObjectNode)
             {
-                $oObj = $oNode->GetProperty('object');
-                $sRootClass = MetaModel::GetRootClass(get_class($oObj));
-                if (!array_key_exists($sRootClass, $aComputed))
+                if ($oNode->GetProperty('is_reached') && (!$oNode->GetProperty('source')))
                 {
-                    $aComputed[$sRootClass] = array();
+                    $oObj = $oNode->GetProperty('object');
+                    $sRootClass = MetaModel::GetRootClass(get_class($oObj));
+                    if (!array_key_exists($sRootClass, $aComputed))
+                    {
+                        $aComputed[$sRootClass] = array();
+                    }
+                    $aComputed[$sRootClass][$oObj->GetKey()] = $oObj;
                 }
-                $aComputed[$sRootClass][$oObj->GetKey()] = $oObj;
             }
         }
 

+ 1 - 1
datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml

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