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

Advanced Search: back to max_combo_length for the external keys

Browse Source 
SVN:b1162[5565]
This commit is contained in:
Eric Espié
2018-03-29 08:54:03 +00:00
parent 155034092f
commit 06f648b714
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,11 +307,6 @@ class SearchForm
*/
public static function GetFieldAllowedValues($oAttrDef)
{
// better than MetaModel::GetConfig()->Get('max_combo_length')
// changing this value can introduce weird behaviour
static $iMaxComboLength = 50;
$aValues = array();
if ($oAttrDef->IsExternalKey(EXTKEY_ABSOLUTE))
{
$sTargetClass = $oAttrDef->GetTargetClass();
@@ -326,13 +321,9 @@ class SearchForm
}
$oSearch->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
$oSet = new DBObjectSet($oSearch);
if ($oSet->Count() > $iMaxComboLength)
{
return array('autocomplete' => true);
}
if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
{
$aValues['autocomplete'] = true;
return array('autocomplete' => true);
}
}
else
@@ -340,20 +331,14 @@ class SearchForm
if (method_exists($oAttrDef, 'GetAllowedValuesAsObjectSet'))
{
$oSet = $oAttrDef->GetAllowedValuesAsObjectSet();
if ($oSet->Count() > $iMaxComboLength)
{
return array('autocomplete' => true);
}
if ($oSet->Count() > MetaModel::GetConfig()->Get('max_combo_length'))
{
$aValues['autocomplete'] = true;
return array('autocomplete' => true);
}
}
}
$aValues['values'] = $oAttrDef->GetAllowedValues();
return $aValues;
return array('values' => $oAttrDef->GetAllowedValues());
}
/**