From a191db23e1d5e4859dcc832e485be8052bde2bd3 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 12 May 2021 10:49:38 +0200
Subject: [PATCH] fix doIndex and doDelete of crud wrapper

---
 core/Controller/Admin/Crud/CrudController.php   | 7 +++++--
 core/Resources/views/admin/crud/index.html.twig | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/Controller/Admin/Crud/CrudController.php b/core/Controller/Admin/Crud/CrudController.php
index 37d0153..9d2a530 100644
--- a/core/Controller/Admin/Crud/CrudController.php
+++ b/core/Controller/Admin/Crud/CrudController.php
@@ -44,7 +44,8 @@ abstract class CrudController extends AdminController
 
     protected function doNew(EntityInterface $entity, EntityManager $entityManager, Request $request): Response
     {
-        $form = $this->createForm($this->forms['new'], $entity);
+        $configuration = $this->getConfiguration();
+        $form = $this->createForm($configuration->getForm('new'), $entity);
 
         if ($request->isMethod('POST')) {
             $form->handleRequest($request);
@@ -62,6 +63,7 @@ abstract class CrudController extends AdminController
 
         return $this->render($configuration->getView('new'), [
             'form' => $form->createView(),
+            'configuration' => $configuration,
             'entity' => $entity,
         ]);
     }
@@ -79,7 +81,6 @@ abstract class CrudController extends AdminController
     protected function doEdit(EntityInterface $entity, EntityManager $entityManager, Request $request): Response
     {
         $configuration = $this->getConfiguration();
-
         $form = $this->createForm($configuration->getForm('edit'), $entity);
 
         if ($request->isMethod('POST')) {
@@ -105,6 +106,8 @@ abstract class CrudController extends AdminController
 
     protected function doDelete(EntityInterface $entity, EntityManager $entityManager, Request $request): Response
     {
+        $configuration = $this->getConfiguration();
+
         if ($this->isCsrfTokenValid('delete'.$entity->getId(), $request->request->get('_token'))) {
             $entityManager->delete($entity);
 
diff --git a/core/Resources/views/admin/crud/index.html.twig b/core/Resources/views/admin/crud/index.html.twig
index 12dd48e..022f4e2 100644
--- a/core/Resources/views/admin/crud/index.html.twig
+++ b/core/Resources/views/admin/crud/index.html.twig
@@ -94,7 +94,7 @@
                             {% endblock %}
                         {% else %}
                             <tr>
-                                <td class="col-12 text-center p-4 text-black-50">
+                                <td class="col-12 text-center p-4 text-black-50" colspan="{{ configuration.fields('index')|length + 1 }}">
                                     <div class="display-1">
                                         <span class="fa fa-search"></span>
                                     </div>