From bd21145701d0d675d297ce49014a915c617d1e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 21 Apr 2020 13:28:24 +0200 Subject: [PATCH] [CRUD] fix error when no crud are created --- CHANGELOG.md | 1 + DependencyInjection/ChillMainExtension.php | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d5c69523..ac014cf08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -113,3 +113,4 @@ Master branch - [chill entity render] fix error when fallback to default entity render (usage of `__toString()`) - [CRUD] add step delete - [CRUD] check that action exists before inserting them in edit and view template +- [CRUD] fix error when no crud are created diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php index 3a0038c17..d33ef4eb9 100644 --- a/DependencyInjection/ChillMainExtension.php +++ b/DependencyInjection/ChillMainExtension.php @@ -99,8 +99,6 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, array('homepage' => $config['widgets']['homepage']): array() ); - - $this->configureCruds($container, $config['cruds']); $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.yml'); @@ -122,7 +120,8 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, $loader->load('services/phonenumber.yml'); $loader->load('services/cache.yml'); $loader->load('services/templating.yml'); - $loader->load('services/crud.yml'); + + $this->configureCruds($container, $config['cruds'], $loader); } public function getConfiguration(array $config, ContainerBuilder $container) @@ -208,12 +207,14 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, * @param array $config the config under 'cruds' key * @return null */ - protected function configureCruds(ContainerBuilder $container, $config) + protected function configureCruds(ContainerBuilder $container, $config, Loader\YamlFileLoader $loader) { if (count($config) === 0) { return; } + $loader->load('services/crud.yml'); + $container->setParameter('chill_main_crud_route_loader_config', $config); $definition = new Definition();