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

Archives: filter out archived objects from the impact analysis, even when in Archive Mode

Browse Source 
SVN:trunk[4707]
This commit is contained in:
Romain Quetiez
2017-04-27 12:42:50 +00:00
parent ee95dd2480
commit f5144c2bb1
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/relationgraph.class.inc.php
View File

@@ -210,6 +210,7 @@ class RelationGraph extends SimpleGraph
if ($sOQL === '') return;
$oSearch = DBObjectSearch::FromOQL($sOQL);
$oSearch->SetArchiveMode(false); // Exclude archived objects anytime
$aAliases = $oSearch->GetSelectedClasses();
if (count($aAliases) < 2 )
{
@@ -394,6 +395,7 @@ class RelationGraph extends SimpleGraph
try
{
$oFlt = DBObjectSearch::FromOQL($sQuery);
$oFlt->SetArchiveMode(false); // Exclude archived objects anytime
$oObjSet = new DBObjectSet($oFlt, array(), $oObject->ToArgsForQuery());
$oRelatedObj = $oObjSet->Fetch();
}
@@ -460,6 +462,7 @@ class RelationGraph extends SimpleGraph
try
{
$oFlt = DBObjectSearch::FromOQL($sQuery);
$oFlt->SetArchiveMode(false); // Exclude archived objects anytime
$oObjSet = new DBObjectSet($oFlt, array(), $oObject->ToArgsForQuery());
$iCount = $oObjSet->Count();
}