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

N°5727 - REST API/get_related: Seemingly wrong results, when using [impacts, up] with [redundancy: true]

Browse Source
This commit is contained in:
Eric Espie
2022-11-16 13:51:38 +01:00
parent 2f8f0b658c
commit 282d47aed4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/dbobjectset.class.php
View File

@@ -141,7 +141,7 @@ class DBObjectSet implements iDBObjectSetIterator
{ {
$sRet = ''; $sRet = '';
$this->Rewind(); $this->Rewind();
$sRet .= "Set (".$this->m_oFilter->ToOQL().")<br/>\n"; $sRet .= "Set (".$this->m_oFilter->ToOQL(true).")<br/>\n";
$sRet .= "Query: <pre style=\"font-size: smaller; display:inline;\">".$this->m_oFilter->MakeSelectQuery().")</pre>\n"; $sRet .= "Query: <pre style=\"font-size: smaller; display:inline;\">".$this->m_oFilter->MakeSelectQuery().")</pre>\n";
$sRet .= $this->Count()." records<br/>\n"; $sRet .= $this->Count()." records<br/>\n";
@@ -154,6 +154,7 @@ class DBObjectSet implements iDBObjectSetIterator
} }
$sRet .= "</ul>\n"; $sRet .= "</ul>\n";
} }
$this->Rewind();
return $sRet; return $sRet;
} }

2
core/dbsearch.class.php
View File

@@ -1717,6 +1717,6 @@ abstract class DBSearch
*/ */
public function __toString() public function __toString()
{ {
return $this->ToOQL(); return $this->ToOQL(true);
} }
} }

2
core/restservices.class.inc.php
View File

@@ -574,7 +574,7 @@ class CoreServices implements iRestServiceProvider
$oObject = $oElement->GetProperty('object'); $oObject = $oElement->GetProperty('object');
if ($oObject) if ($oObject)
{ {
if ($bEnableRedundancy) if ($bEnableRedundancy && $sDirection == 'down')
{ {
// Add only the "reached" objects // Add only the "reached" objects
if ($oElement->GetProperty('is_reached')) if ($oElement->GetProperty('is_reached'))