|
@@ -22,7 +22,6 @@ use Sonata\AdminBundle\Filter\FilterFactoryInterface;
|
|
|
|
|
|
use Sonata\DoctrineORMAdminBundle\Datagrid\Pager;
|
|
|
use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery;
|
|
|
-
|
|
|
use Symfony\Component\Form\FormFactory;
|
|
|
|
|
|
use Doctrine\ORM\Mapping\ClassMetadataInfo;
|
|
@@ -72,7 +71,6 @@ class DatagridBuilder implements DatagridBuilderInterface
|
|
|
}
|
|
|
|
|
|
$fieldDescription->setOption('code', $fieldDescription->getOption('code', $fieldDescription->getName()));
|
|
|
- $fieldDescription->setOption('label', $fieldDescription->getOption('label', $fieldDescription->getName()));
|
|
|
$fieldDescription->setOption('name', $fieldDescription->getOption('name', $fieldDescription->getName()));
|
|
|
}
|
|
|
|
|
@@ -98,7 +96,7 @@ class DatagridBuilder implements DatagridBuilderInterface
|
|
|
if (is_array($value)) {
|
|
|
$fieldDescription->setOption($name, array_merge($value, $fieldDescription->getOption($name, array())));
|
|
|
} else {
|
|
|
- $fieldDescription->setOption($name, $fieldDescription->getOption($name, $value));
|
|
|
+ $fieldDescription->setOption($name, $fieldDescription->getOption($name, $value));
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
@@ -111,6 +109,10 @@ class DatagridBuilder implements DatagridBuilderInterface
|
|
|
$fieldDescription->mergeOption('field_options', array('required' => false));
|
|
|
$filter = $this->filterFactory->create($fieldDescription->getName(), $type, $fieldDescription->getOptions());
|
|
|
|
|
|
+ if (!$filter->getLabel()) {
|
|
|
+ $filter->setLabel($admin->getLabelTranslatorStrategy()->getLabel($fieldDescription->getName(), 'filter', 'label'));
|
|
|
+ }
|
|
|
+
|
|
|
$datagrid->addFilter($filter);
|
|
|
|
|
|
return $datagrid->addFilter($filter);
|