Fix not setting field_name when filtering (#680)

sonata-project · Sep 22, 2021 · 855bd55 · 855bd55
1 parent 7315a8c
commit 855bd55
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Builder/DatagridBuilder.php b/src/Builder/DatagridBuilder.php
@@ -81,7 +81,7 @@ public function fixFieldDescription(FieldDescriptionInterface $fieldDescription)
             $fieldDescription->setOption('parent_association_mappings', $fieldDescription->getOption('parent_association_mappings', $fieldDescription->getParentAssociationMappings()));
         }
 
-        $fieldDescription->setOption('name', $fieldDescription->getOption('name', $fieldDescription->getName()));
+        $fieldDescription->setOption('field_name', $fieldDescription->getOption('field_name', $fieldDescription->getFieldName()));
 
         if ($fieldDescription->describesAssociation()) {
             $fieldDescription->getAdmin()->attachAdminClass($fieldDescription);

diff --git a/tests/Builder/DatagridBuilderTest.php b/tests/Builder/DatagridBuilderTest.php
@@ -231,4 +231,13 @@ public function testAddFilterWithType(): void
 
         static::assertSame(ModelFilter::class, $fieldDescription->getType());
     }
+
+    public function testFixFieldDescriptionSetsFieldName(): void
+    {
+        $fieldDescription = new FieldDescription('name', [], [], [], [], 'fieldName');
+
+        $this->datagridBuilder->fixFieldDescription($fieldDescription);
+
+        static::assertSame('fieldName', $fieldDescription->getOption('field_name'));
+    }
 }