composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Advanced Search: read-only selection criteria to add an object

Browse Source 
SVN:b1162[5557]
This commit is contained in:
Eric Espié
2018-03-28 14:57:54 +00:00
parent 2811eb66c5
commit 26ec1269a5
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,9 +44,11 @@ class CriterionToSearchForm extends CriterionConversionAbstract
*
* @param array $aClasses all the classes of the filter
*
* @param bool $bIsRemovable
*
* @return array
*/
public static function Convert($aAndCriterionRaw, $aFieldsByCategory, $aClasses)
public static function Convert($aAndCriterionRaw, $aFieldsByCategory, $aClasses, $bIsRemovable = true)
{
$aAllFields = array();
foreach($aFieldsByCategory as $aFields)
@@ -71,10 +73,17 @@ class CriterionToSearchForm extends CriterionConversionAbstract
foreach($aAndCriterionRaw as $aCriteria)
{
$aCriteria['label'] = trim($aCriteria['label'], "()");
$aCriteria['is_removable'] = $bIsRemovable;
if (!$bIsRemovable)
{
$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
}
// Check criteria validity
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))
{