composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 23:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Advanced Search: generic title for raw filters on joined classes

Browse Source 
SVN:b1162[5551]
This commit is contained in:
Eric Espié
2018-03-28 07:46:47 +00:00
parent 7868a38137
commit 5772042dd3
6 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
View File

@@ -32,6 +32,8 @@ use Combodo\iTop\Application\Search\CriterionConversionAbstract;
use DateInterval;
use DateTime;
use Dict;
use Exception;
use MetaModel;
class CriterionToSearchForm extends CriterionConversionAbstract
{
@@ -40,9 +42,11 @@ class CriterionToSearchForm extends CriterionConversionAbstract
* @param array $aAndCriterionRaw
* @param array $aFieldsByCategory
*
* @param array $aClasses all the classes of the filter
*
* @return array
*/
public static function Convert($aAndCriterionRaw, $aFieldsByCategory)
public static function Convert($aAndCriterionRaw, $aFieldsByCategory, $aClasses)
{
$aAllFields = array();
foreach($aFieldsByCategory as $aFields)
@@ -71,6 +75,22 @@ class CriterionToSearchForm extends CriterionConversionAbstract
if (!array_key_exists('ref', $aCriteria) || !array_key_exists($aCriteria['ref'], $aAllFields))
{
$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
$aCriteria['label'] = Dict::S('UI:Search:Criteria:Raw:Filtered');
if (array_key_exists('ref', $aCriteria))
{
$aRef = explode('.', $aCriteria['ref']);
if (isset($aClasses[$aRef[0]]))
{
$sClass = $aClasses[$aRef[0]];
try
{
$aCriteria['label'] = Dict::Format('UI:Search:Criteria:Raw:FilteredOn', MetaModel::GetName($sClass));
}
catch (Exception $e)
{
}
}
}
}
if (array_key_exists('widget', $aCriteria))
{