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

#53 Global search always returning all organization, reviewed Denis's fix

Browse Source 
SVN:trunk[204]
This commit is contained in:
Romain Quetiez
2009-12-26 13:06:28 +00:00
parent d3d617fabe
commit 37c5880ced
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/dbobjectsearch.class.php
View File

@@ -275,8 +275,6 @@ class DBObjectSearch
public function AddCondition_FullText($sFullText)
{
$this->m_aFullText[] = $sFullText;
$index = count($this->m_aParams) + 1;
$this->m_aParams['param'.$index] = 1;
}
protected function AddToNameSpace(&$aClassAliases, &$aAliasTranslation)
@@ -466,7 +464,7 @@ class DBObjectSearch
public function RenderCondition()
{
return $this->m_oSearchCondition->Render($this->m_aParams, true);
return $this->m_oSearchCondition->Render($this->m_aParams, false);
}
public function serialize()
@@ -634,6 +632,12 @@ class DBObjectSearch
$sRes = "SELECT ".$this->GetClass().' AS '.$this->GetClassAlias();
$sRes .= $this->ToOQL_Joins();
$sRes .= " WHERE ".$this->m_oSearchCondition->Render($aParams, $bRetrofitParams);
// Temporary: add more info about other conditions, necessary to avoid strange behaviors with the cache
foreach($this->m_aFullText as $sFullText)
{
$sRes .= " AND MATCHES '$sFullText'";
}
return $sRes;
}