EZP-28656: Author fieldtype is not filtering out empty rows (ezsystem…

…s#206)
ezpublishlegacy · Dec 21, 2017 · 6018f4a · 6018f4a
1 parent 81f2d2f
commit 6018f4a
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/lib/Form/Type/FieldType/AuthorFieldType.php b/lib/Form/Type/FieldType/AuthorFieldType.php
@@ -13,6 +13,8 @@
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -34,7 +36,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('authors', AuthorCollectionType::class, [])
-            ->addViewTransformer($this->getViewTransformer());
+            ->addViewTransformer($this->getViewTransformer())
+            ->addEventListener(FormEvents::POST_SUBMIT, [$this, 'filterOutEmptyAuthors']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -56,16 +59,24 @@ public function getViewTransformer(): DataTransformerInterface
 
             return $value;
         }, function (Value $value) {
-            $value->authors->exchangeArray(
-                array_filter(
-                    $value->authors->getArrayCopy(),
-                    function (Author $author) {
-                        return !empty($author->email);
-                    }
-                )
-            );
-
             return $value;
         });
     }
+
+    /**
+     * @param FormEvent $event
+     */
+    public function filterOutEmptyAuthors(FormEvent $event)
+    {
+        $value = $event->getData();
+
+        $value->authors->exchangeArray(
+            array_filter(
+                $value->authors->getArrayCopy(),
+                function (Author $author) {
+                    return !empty($author->email) || !empty($author->name);
+                }
+            )
+        );
+    }
 }