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

N°917: Fix Search criterion when TagSet = 'tag1 tag2...'

Browse Source
This commit is contained in:
Eric
2018-09-28 17:33:05 +02:00
parent 2e255b10a7
commit 8f55d4054a
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/application/search/CriterionConversionTest.php
View File

@@ -478,6 +478,11 @@ class CriterionConversionTest extends ItopDataTestCase
'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE ((`UserRequest`.`tagfield` MATCHES 'tag1 tag2' OR (`UserRequest`.`tagfield` = '')) AND 1)",
'ExpectedCriterion' => array(array('widget' => 'tag_set')),
),
'TagSet equals' => array(
'OQL' => "SELECT UserRequest WHERE tagfield = 'tag1 tag2'",
'ExpectedOQL' => "SELECT `UserRequest` FROM UserRequest AS `UserRequest` WHERE (`UserRequest`.`tagfield` MATCHES 'tag1' AND `UserRequest`.`tagfield` MATCHES 'tag2')",
'ExpectedCriterion' => array(array('widget' => 'tag_set')),
),
);
}
@@ -655,7 +660,9 @@ class CriterionConversionTest extends ItopDataTestCase
{
$sAttributeClass = ($aCriteria['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME) ? AttributeDateTime::class : AttributeDate::class;
$oFormat = $sAttributeClass::GetFormat();
/** @var \AttributeDateTime $sAttributeClass */
/** @var \DateTimeFormat $oFormat */
$oFormat = $sAttributeClass::GetFormat();
foreach($aCriteria['values'] as $i => $aValue)
{