kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #7086 from GSadee/grid-filters-fixes

Browse source 
[Grid] Fix entity filter to accept only fields option
This commit is contained in:
Paweł Jędrzejewski 2016-12-14 13:25:49 +01:00 • committed by GitHub
commit 13cf22f2f4
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Sylius/Bundle/GridBundle/Form/Type/Filter/EntityFilterType.php
View file

@ -33,8 +33,6 @@ final class EntityFilterType extends AbstractType
'placeholder' => 'sylius.ui.all',
])
->setRequired('class')
->setDefined('field')
->setAllowedTypes('field', 'string')
->setDefined('fields')
->setAllowedTypes('fields', 'array')
;

3
src/Sylius/Component/Grid/Filter/EntityFilter.php
View file

@ -28,8 +28,7 @@ final class EntityFilter implements FilterInterface
return;
}
$field = isset($options['field']) ? $options['field'] : $name;
$fields = isset($options['fields']) ? $options['fields'] : [$field];
$fields = isset($options['fields']) ? $options['fields'] : [$name];
$expressionBuilder = $dataSource->getExpressionBuilder();