From c05f43b2ea3d2e8ce9d294e59e3b1be534d278f0 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 17 May 2021 15:30:24 +0200
Subject: [PATCH] update crud controller: add form options, fix filters

---
 core/Controller/Admin/Crud/CrudController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/Controller/Admin/Crud/CrudController.php b/core/Controller/Admin/Crud/CrudController.php
index e73d129..d435d88 100644
--- a/core/Controller/Admin/Crud/CrudController.php
+++ b/core/Controller/Admin/Crud/CrudController.php
@@ -31,6 +31,7 @@ abstract class CrudController extends AdminController
         $configuration = $this->getConfiguration();
 
         $this->applySort('index', $query, $request);
+        $this->updateFilters($request, $session);
 
         $pager = $query
             ->useFilters($this->filters)
@@ -54,7 +55,7 @@ abstract class CrudController extends AdminController
 
         $this->prepareEntity($entity);
 
-        $form = $this->createForm($configuration->getForm('new'), $entity);
+        $form = $this->createForm($configuration->getForm('new'), $entity, $configuration->getFormOptions('new'));
 
         if ($request->isMethod('POST')) {
             $form->handleRequest($request);
@@ -97,7 +98,7 @@ abstract class CrudController extends AdminController
 
         $this->prepareEntity($entity);
 
-        $form = $this->createForm($configuration->getForm('edit'), $entity);
+        $form = $this->createForm($configuration->getForm('edit'), $entity, $configuration->getFormOptions('edit'));
 
         if ($request->isMethod('POST')) {
             $form->handleRequest($request);