Ivan Borzenkov 13 anni fa
parent
commit
7de6a66112
3 ha cambiato i file con 12 aggiunte e 6 eliminazioni
  1. 2 2
      Form/Type/AdminType.php
  2. 5 2
      Form/Type/ModelReferenceType.php
  3. 5 2
      Form/Type/ModelType.php

+ 2 - 2
Form/Type/AdminType.php

@@ -13,7 +13,7 @@ namespace Sonata\AdminBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormTypeInterface;
-use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 
 use Sonata\AdminBundle\Form\DataTransformer\ArrayToModelTransformer;
 
@@ -22,7 +22,7 @@ class AdminType extends AbstractType
     /**
      * {@inheritDoc}
      */
-    public function buildForm(FormBuilder $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $admin = $this->getAdmin($options);
         if ($options['delete'] && $admin->isGranted('DELETE') ) {

+ 5 - 2
Form/Type/ModelReferenceType.php

@@ -26,12 +26,15 @@ use Sonata\AdminBundle\Model\ModelManagerInterface;
 
 class ModelReferenceType extends AbstractType
 {
+    private $parent;
+
     /**
      * {@inheritDoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->prependClientTransformer(new ModelToIdTransformer($options['model_manager'], $options['class']));
+        $this->parent = $options['parent'];
     }
 
     /**
@@ -49,9 +52,9 @@ class ModelReferenceType extends AbstractType
     /**
      * {@inheritDoc}
      */
-    public function getParent(array $options)
+    public function getParent()
     {
-        return $options['parent'];
+        return $this->parent;
     }
 
     /**

+ 5 - 2
Form/Type/ModelType.php

@@ -28,6 +28,8 @@ use Sonata\AdminBundle\Model\ModelManagerInterface;
 
 class ModelType extends AbstractType
 {
+    private $parent;
+
     /**
      * {@inheritDoc}
      */
@@ -40,6 +42,7 @@ class ModelType extends AbstractType
         } else {
             $builder->prependClientTransformer(new ModelToIdTransformer($options['model_manager'], $options['class']));
         }
+        $this->parent = isset($options['parent']) ? $options['parent'] : 'choice';
     }
 
     /**
@@ -80,9 +83,9 @@ class ModelType extends AbstractType
     /**
      * {@inheritDoc}
      */
-    public function getParent(array $options)
+    public function getParent()
     {
-        return isset($options['parent']) ? $options['parent'] : 'choice';
+        return $this->parent;
     }
 
     /**