浏览代码

Fix filter

Thomas Rabaix 13 年之前
父节点
当前提交
0066905cf1
共有 2 个文件被更改,包括 4 次插入8 次删除
  1. 2 2
      Form/DataTransformer/ModelToIdTransformer.php
  2. 2 6
      Form/Type/ModelReferenceType.php

+ 2 - 2
Form/DataTransformer/ModelToIdTransformer.php

@@ -57,9 +57,9 @@ class ModelToIdTransformer implements DataTransformerInterface
     public function transform($entity)
     public function transform($entity)
     {
     {
         if (empty($entity)) {
         if (empty($entity)) {
-            return 0;
+            return null;
         }
         }
 
 
-        return current( $this->modelManager->getIdentifierValues($entity) );
+        return current($this->modelManager->getIdentifierValues($entity));
     }
     }
 }
 }

+ 2 - 6
Form/Type/ModelReferenceType.php

@@ -34,7 +34,7 @@ class ModelReferenceType extends AbstractType
      */
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
     {
-        $builder->prependClientTransformer(new ModelToIdTransformer($options['model_manager'], $options['class']));
+        $builder->addModelTransformer(new ModelToIdTransformer($options['model_manager'], $options['class']));
     }
     }
 
 
     /**
     /**
@@ -42,12 +42,8 @@ class ModelReferenceType extends AbstractType
      */
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
     {
-        $compound = function (Options $options) {
-            return isset($options['parent']) ? $options['parent'] : 'hidden';
-        };
-
         $resolver->setDefaults(array(
         $resolver->setDefaults(array(
-            'compound'      => $compound,
+            'compound'      => false,
             'model_manager' => null,
             'model_manager' => null,
             'class'         => null
             'class'         => null
         ));
         ));