Merge branch 'master' into upgrade-php82

This commit is contained in:
2023-03-06 16:37:09 +01:00
41 changed files with 254 additions and 233 deletions

View File

@@ -11,7 +11,6 @@ declare(strict_types=1);
namespace Chill\MainBundle\Form\Type\Export;
use Chill\MainBundle\Center\GroupingCenterInterface;
use Chill\MainBundle\Entity\Center;
use Chill\MainBundle\Entity\Regroupment;
use Chill\MainBundle\Export\ExportManager;
@@ -72,8 +71,10 @@ final class PickCenterType extends AbstractType
return $c->getName();
},
'data' => $centers,
])
->add('regroupment', EntityType::class, [
]);
if (count($this->regroupmentRepository->findAllActive()) > 0) {
$builder->add('regroupment', EntityType::class, [
'class' => Regroupment::class,
'label' => 'regroupment',
'multiple' => true,
@@ -83,6 +84,7 @@ final class PickCenterType extends AbstractType
return $r->getName();
},
]);
}
$builder->setDataMapper(new ExportPickCenterDataMapper());
}