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

Advanced Search: Fix labels for starts with and contains

Browse Source 
SVN:b1162[5531]
This commit is contained in:
Eric Espié
2018-03-26 15:13:19 +00:00
parent f0c8b348c6
commit e01f48303b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/oql/expression.class.inc.php
View File

@@ -661,11 +661,6 @@ class ScalarExpression extends UnaryExpression
*/
public function Display($oSearch, &$aArgs = null, $oAttDef = null)
{
if (strpos($this->m_value, '%') === 0)
{
return '';
}
if (!is_null($oAttDef))
{
if ($oAttDef->IsExternalKey())
@@ -682,7 +677,15 @@ class ScalarExpression extends UnaryExpression
}
}
return $oAttDef->GetAsPlainText($this->m_value);
if (!($oAttDef instanceof AttributeDateTime))
{
return $oAttDef->GetAsPlainText($this->m_value);
}
}
if (strpos($this->m_value, '%') === 0)
{
return '';
}
return $this->Render($aArgs);