Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 05:44:24 +00:00
Code Issues Actions Projects Releases Wiki Activity

[CRUD] fix error when no crud are created

Browse Source
This commit is contained in:
Julien Fastré 2020-04-21 13:28:24 +02:00
parent 1e06393a7d
commit bd21145701
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -113,3 +113,4 @@ Master branch
- [chill entity render] fix error when fallback to default entity render (usage of `__toString()`) - [chill entity render] fix error when fallback to default entity render (usage of `__toString()`)
- [CRUD] add step delete - [CRUD] add step delete
- [CRUD] check that action exists before inserting them in edit and view template - [CRUD] check that action exists before inserting them in edit and view template
- [CRUD] fix error when no crud are created

9
DependencyInjection/ChillMainExtension.php
View File

@ -99,8 +99,6 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
array('homepage' => $config['widgets']['homepage']): array('homepage' => $config['widgets']['homepage']):
array() array()
); );
$this->configureCruds($container, $config['cruds']);
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.yml'); $loader->load('services.yml');
@ -122,7 +120,8 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
$loader->load('services/phonenumber.yml'); $loader->load('services/phonenumber.yml');
$loader->load('services/cache.yml'); $loader->load('services/cache.yml');
$loader->load('services/templating.yml'); $loader->load('services/templating.yml');
$loader->load('services/crud.yml');
$this->configureCruds($container, $config['cruds'], $loader);
} }
public function getConfiguration(array $config, ContainerBuilder $container) 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 * @param array $config the config under 'cruds' key
* @return null * @return null
*/ */
protected function configureCruds(ContainerBuilder $container, $config) protected function configureCruds(ContainerBuilder $container, $config, Loader\YamlFileLoader $loader)
{ {
if (count($config) === 0) { if (count($config) === 0) {
return; return;
} }
$loader->load('services/crud.yml');
$container->setParameter('chill_main_crud_route_loader_config', $config); $container->setParameter('chill_main_crud_route_loader_config', $config);
$definition = new Definition(); $definition = new Definition();