From 8c447e109d79ae6cf38a69b46aa461c4164731bf Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Fri, 22 Jul 2022 08:50:28 +0200 Subject: [PATCH] Add missing operator type (#766) --- src/Filter/ChoiceFilter.php | 5 ++--- src/Filter/NumberFilter.php | 1 + src/Filter/StringFilter.php | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Filter/ChoiceFilter.php b/src/Filter/ChoiceFilter.php index 6a044d41..bb1f73cc 100644 --- a/src/Filter/ChoiceFilter.php +++ b/src/Filter/ChoiceFilter.php @@ -14,7 +14,6 @@ namespace Sonata\DoctrineMongoDBAdminBundle\Filter; use Sonata\AdminBundle\Filter\Model\FilterData; -use Sonata\AdminBundle\Form\Type\Operator\ContainsOperatorType; use Sonata\AdminBundle\Form\Type\Operator\EqualOperatorType; use Sonata\DoctrineMongoDBAdminBundle\Datagrid\ProxyQueryInterface; @@ -57,7 +56,7 @@ protected function filter(ProxyQueryInterface $query, string $field, FilterData return; } - if ($data->isType(ContainsOperatorType::TYPE_NOT_CONTAINS)) { + if ($data->isType(EqualOperatorType::TYPE_NOT_EQUAL)) { $queryBuilder->field($field)->notIn($value); } else { $queryBuilder->field($field)->in($value); @@ -69,7 +68,7 @@ protected function filter(ProxyQueryInterface $query, string $field, FilterData return; } - if ($data->isType(ContainsOperatorType::TYPE_NOT_CONTAINS)) { + if ($data->isType(EqualOperatorType::TYPE_NOT_EQUAL)) { $queryBuilder->field($field)->notEqual($value); } else { $queryBuilder->field($field)->equals($value); diff --git a/src/Filter/NumberFilter.php b/src/Filter/NumberFilter.php index a9d0afbd..efa2d580 100644 --- a/src/Filter/NumberFilter.php +++ b/src/Filter/NumberFilter.php @@ -42,6 +42,7 @@ public function getFormOptions(): array 'field_type' => $this->getFieldType(), 'field_options' => $this->getFieldOptions(), 'label' => $this->getLabel(), + 'operator_type' => NumberOperatorType::class, ]; } diff --git a/src/Filter/StringFilter.php b/src/Filter/StringFilter.php index 7f557194..60389e5e 100644 --- a/src/Filter/StringFilter.php +++ b/src/Filter/StringFilter.php @@ -40,6 +40,7 @@ public function getFormOptions(): array 'field_type' => $this->getFieldType(), 'field_options' => $this->getFieldOptions(), 'label' => $this->getLabel(), + 'operator_type' => ContainsOperatorType::class, ]; }