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

Advanced Search: Fix ExternalFields allowed values

Browse Source 
SVN:trunk[5666]
This commit is contained in:
Eric Espié
2018-04-13 14:43:11 +00:00
parent 163f5dba8a
commit d5b145e052
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@ use IssueLog;
use MetaModel;
use TrueExpression;
use utils;
use ValueSetObjects;
use WebPage;
class SearchForm
@@ -402,7 +403,14 @@ class SearchForm
{
if ($oAttrDef->IsExternalKey(EXTKEY_ABSOLUTE))
{
$sTargetClass = $oAttrDef->GetTargetClass();
if ($oAttrDef instanceof AttributeExternalField)
{
$sTargetClass = $oAttrDef->GetFinalAttDef()->GetTargetClass();
}
else
{
$sTargetClass = $oAttrDef->GetTargetClass();
}
try
{
$oSearch = new DBObjectSearch($sTargetClass);
@@ -419,6 +427,13 @@ class SearchForm
{
return array('autocomplete' => true, 'count' => $iCount);
}
if ($oAttrDef instanceof AttributeExternalField)
{
// Let's propose every existing value
$oValSetDef = new ValueSetObjects('SELECT '.$sTargetClass);
$aAllowedValues = $oValSetDef->GetValues(array());
return array('values' => $aAllowedValues, 'count' => count($aAllowedValues));
}
}
else
{