Merge pull request #82 from daniel-pinciuc/master

Fixed a2lix_translations form type and collection type config conflict
a2lix · Nov 7, 2013 · 9ef15ed · 9ef15ed
2 parents 3412358 + 3703954
commit 9ef15ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Form/Type/TranslationsFieldsType.php b/Form/Type/TranslationsFieldsType.php
@@ -16,8 +16,8 @@ class TranslationsFieldsType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         foreach ($options['fields'] as $fieldName => $fieldConfig) {
-            $fieldType = $fieldConfig['type'];
-            unset($fieldConfig['type']);
+            $fieldType = $fieldConfig['field_type'];
+            unset($fieldConfig['field_type']);
 
             $builder->add($fieldName, $fieldType, $fieldConfig);
         }

diff --git a/TranslationForm/TranslationForm.php b/TranslationForm/TranslationForm.php
@@ -80,8 +80,8 @@ public function getChildrenOptions($class, $options)
      */
     public function guessMissingChildOptions($guesser, $class, $property, $options)
     {
-        if (!isset($options['type']) && ($typeGuess = $guesser->guessType($class, $property))) {
-            $options['type'] = $typeGuess->getType();
+        if (!isset($options['field_type']) && ($typeGuess = $guesser->guessType($class, $property))) {
+            $options['field_type'] = $typeGuess->getType();
         }
 
         if (!isset($options['pattern']) && ($patternGuess = $guesser->guessPattern($class, $property))) {