Forráskód Böngészése

Fix set up header label in list mapper (#4621)

Adam 7 éve
szülő
commit
11b79f0042
2 módosított fájl, 2 hozzáadás és 7 törlés
  1. 0 5
      Datagrid/ListMapper.php
  2. 2 2
      Tests/Datagrid/ListMapperTest.php

+ 0 - 5
Datagrid/ListMapper.php

@@ -122,11 +122,6 @@ class ListMapper extends BaseMapper
                 'label',
                 $this->admin->getLabelTranslatorStrategy()->getLabel($fieldDescription->getName(), 'list', 'label')
             );
-        } elseif ($fieldDescription->getLabel() !== false) {
-            $fieldDescription->setOption(
-                'label',
-                $this->admin->getLabelTranslatorStrategy()->getLabel($fieldDescription->getLabel(), 'list', 'label')
-            );
         }
 
         // add the field with the FormBuilder

+ 2 - 2
Tests/Datagrid/ListMapperTest.php

@@ -110,7 +110,7 @@ class ListMapperTest extends PHPUnit_Framework_TestCase
     public function testAdd()
     {
         $this->listMapper->add('fooName');
-        $this->listMapper->add('fooNameLabelBar', null, array('label' => 'fooBar'));
+        $this->listMapper->add('fooNameLabelBar', null, array('label' => 'Foo Bar'));
         $this->listMapper->add('fooNameLabelFalse', null, array('label' => false));
 
         $this->assertTrue($this->listMapper->has('fooName'));
@@ -122,7 +122,7 @@ class ListMapperTest extends PHPUnit_Framework_TestCase
         $this->assertInstanceOf('Sonata\AdminBundle\Admin\FieldDescriptionInterface', $fieldDescription);
         $this->assertSame('fooName', $fieldDescription->getName());
         $this->assertSame('fooName', $fieldDescription->getOption('label'));
-        $this->assertSame('fooBar', $fieldLabelBar->getOption('label'));
+        $this->assertSame('Foo Bar', $fieldLabelBar->getOption('label'));
         $this->assertFalse($fieldLabelFalse->getOption('label'));
     }