composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 15:52:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Portal: Browse brick: Filtering in list view now looks up in all the displayed fields (<name_att /> and <fields /> of the brick configuration)

Browse Source 
SVN:trunk[4545]
This commit is contained in:
Guillaume Lajarige
2017-01-11 16:32:37 +00:00
parent 79a2ab8abd
commit a204a786c0
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php
View File

@@ -119,24 +119,45 @@ class BrowseBrickController extends BrickController
trim($sSearchValue); trim($sSearchValue);
}); });
// - Retrieving fields to search
$aSearchFields = array($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['name_att']);
if (!empty($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['fields']))
{
foreach ($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['fields'] as $aTmpField)
{
$aSearchFields[] = $aTmpField['code'];
}
}
// - Building query for the search values parts // - Building query for the search values parts
$oLevelBinExpr = null; $oLevelBinExpr = null;
$iFieldLoopMax = count($aSearchFields) - 1;
$iSearchLoopMax = count($aSearchValues) - 1; $iSearchLoopMax = count($aSearchValues) - 1;
for ($j = 0; $j <= $iSearchLoopMax; $j++) for ($j = 0; $j <= $iFieldLoopMax; $j++)
{ {
$oSearchBinExpr = new BinaryExpression(new FieldExpression($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['name_att'], $aLevelsPropertiesKeys[$i]), 'LIKE', new VariableExpression('search_value_' . $j)); $sTmpFieldAttCode = $aSearchFields[$j];
$oFieldBinExpr = null;
//$oFieldBinExpr = new BinaryExpression(new FieldExpression($aSearchFields[$j], $aLevelsPropertiesKeys[$i]), )
for ($k = 0; $k <= $iSearchLoopMax; $k++)
{
$oSearchBinExpr = new BinaryExpression(new FieldExpression($sTmpFieldAttCode, $aLevelsPropertiesKeys[$i]), 'LIKE', new VariableExpression('search_value_' . $k));
if ($k === 0)
{
$oFieldBinExpr = $oSearchBinExpr;
}
else
{
$oFieldBinExpr = new BinaryExpression($oFieldBinExpr, 'AND', $oSearchBinExpr);
}
}
if ($j === 0) if ($j === 0)
{ {
$oLevelBinExpr = $oSearchBinExpr; $oLevelBinExpr = $oFieldBinExpr;
} }
else else
{ {
$oLevelBinExpr = new BinaryExpression($oLevelBinExpr, 'AND', $oSearchBinExpr); $oLevelBinExpr = new BinaryExpression($oLevelBinExpr, 'OR', $oFieldBinExpr);
}
if ($j === $iSearchLoopMax)
{
} }
} }
@@ -601,14 +622,7 @@ class BrowseBrickController extends BrickController
foreach ($aLevelsProperties[$key]['fields'] as $aField) foreach ($aLevelsProperties[$key]['fields'] as $aField)
{ {
$oAttDef = MetaModel::GetAttributeDef(get_class($value), $aField['code']); $oAttDef = MetaModel::GetAttributeDef(get_class($value), $aField['code']);
if ($oAttDef->GetEditClass() === 'Duration') $aRow[$key]['fields'][$aField['code']] = $oAttDef->GetValueLabel($value->Get($aField['code']));
{
$aRow[$key]['fields'][$aField['code']] = $oAttDef->GetAsHTML($value->Get($aField['code']));
}
else
{
$aRow[$key]['fields'][$aField['code']] = $oAttDef->GetValueLabel($value->Get($aField['code']));
}
} }
} }
} }