[Form] Fixed label of prototype in CollectionType

webmozart · webmozart · commit 6e0b03a6e21c · 2012-04-06T19:45:42.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -26,7 +26,9 @@ class CollectionType extends AbstractType
     public function buildForm(FormBuilder $builder, array $options)
     {
         if ($options['allow_add'] && $options['prototype']) {
-            $prototype = $builder->create($options['prototype_name'], $options['type'], $options['options']);
+            $prototype = $builder->create($options['prototype_name'], $options['type'], array_replace(array(
+                'label' => $options['prototype_name'] . 'label__',
+            ), $options['options']));
             $builder->setAttribute('prototype', $prototype->getForm());
         }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -192,8 +192,9 @@ public function testPrototypeDefaultLabel()
             'type'      => 'file',
             'allow_add' => true,
             'prototype' => true,
+            'prototype_name' => '__test__',
         ));
 
-        $this->assertSame('__name__', $form->createView()->get('prototype')->get('label'));
+        $this->assertSame('__test__label__', $form->createView()->get('prototype')->get('label'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ class CollectionType extends AbstractType`
`26`	`26`	`public function buildForm(FormBuilder $builder, array $options)`
`27`	`27`	`{`
`28`	`28`	`if ($options['allow_add'] && $options['prototype']) {`
`29`		`- $prototype = $builder->create($options['prototype_name'], $options['type'], $options['options']);`
	`29`	`+ $prototype = $builder->create($options['prototype_name'], $options['type'], array_replace(array(`
	`30`	`+ 'label' => $options['prototype_name'] . 'label__',`
	`31`	`+ ), $options['options']));`
`30`	`32`	`$builder->setAttribute('prototype', $prototype->getForm());`
`31`	`33`	`}`
`32`	`34`
Original file line number	Diff line number	Diff line change
`@@ -192,8 +192,9 @@ public function testPrototypeDefaultLabel()`
`192`	`192`	`'type' => 'file',`
`193`	`193`	`'allow_add' => true,`
`194`	`194`	`'prototype' => true,`
	`195`	`+ 'prototype_name' => '__test__',`
`195`	`196`	`));`
`196`	`197`
`197`		`- $this->assertSame('__name__', $form->createView()->get('prototype')->get('label'));`
	`198`	`+ $this->assertSame('__test__label__', $form->createView()->get('prototype')->get('label'));`
`198`	`199`	`}`
`199`	`200`	`}`