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

N°1381 - Search on string with index -> operator = (Fixed for derived classes)

Browse Source 
SVN:trunk[5906]
This commit is contained in:
Eric Espié
2018-06-25 10:51:15 +00:00
parent 0449470cdf
commit 1e11ed3041
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sources/application/search/searchform.class.inc.php
View File

@@ -329,7 +329,7 @@ class SearchForm
*/
protected function PopulateFieldList($sClass, $sAlias, &$aZList, &$aOthers)
{
$aDBIndexes = MetaModel::DBGetIndexes($sClass);
$aDBIndexes = self::DBGetIndexes($sClass);
$aIndexes = array();
foreach($aDBIndexes as $aIndexGroup)
{
@@ -381,6 +381,23 @@ class SearchForm
});
}
/**
* Search indexes for class and parents
* @param $sClass
*
* @return array
* @throws \CoreException
*/
protected static function DBGetIndexes($sClass)
{
$aDBIndexes = MetaModel::DBGetIndexes($sClass);
while ($sClass = MetaModel::GetParentClass($sClass))
{
$aDBIndexes = array_merge($aDBIndexes, MetaModel::DBGetIndexes($sClass));
}
return $aDBIndexes;
}
protected function IsSubAttribute($oAttDef)
{
return (($oAttDef instanceof AttributeFriendlyName) || ($oAttDef instanceof AttributeExternalField) || ($oAttDef instanceof AttributeSubItem));