composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°828 - GetSelectFilter issue with DBUnionSearch

Browse Source
This commit is contained in:
Eric
2018-11-02 16:01:56 +01:00
parent 54eb41b66f
commit 389a1791d7
2 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/dbunionsearch.class.php
View File

@@ -312,9 +312,9 @@ class DBUnionSearch extends DBSearch
/**
* Specify a condition on external keys or link sets
* @param sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
* @param String sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
* Example: infra_list->ci_id->location_id->country
* @param value The value to match (can be an array => IN(val1, val2...)
* @param Object value The value to match (can be an array => IN(val1, val2...)
* @return void
*/
public function AddConditionAdvanced($sAttSpec, $value)
@@ -598,4 +598,34 @@ class DBUnionSearch extends DBSearch
if (self::$m_bDebugQuery) $oSQLQuery->DisplayHtml();
return $oSQLQuery;
}
/**
* @return \Expression
*/
public function GetCriteria()
{
return new TrueExpression();
}
protected function IsDataFiltered()
{
$bIsAllDataFiltered = true;
foreach ($this->aSearches as $oSearch)
{
if (!$oSearch->IsDataFiltered())
{
$bIsAllDataFiltered = false;
break;
}
}
return $bIsAllDataFiltered;
}
protected function SetDataFiltered()
{
foreach ($this->aSearches as $oSearch)
{
$oSearch->SetDataFiltered();
}
}
}