Fixed exception: The option "csrf_protection" does not exist

This is a port of sonata-project/SonataDoctrineORMAdminBundle@8d b870931fca7b6aa5f6d335db3399595c40330f and https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/pull/ 89
sonata-project · Apr 11, 2014 · 749cf94 · 749cf94
1 parent f86ed81
commit 749cf94
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/Builder/DatagridBuilder.php b/Builder/DatagridBuilder.php
@@ -42,6 +42,13 @@ class DatagridBuilder implements DatagridBuilderInterface
      */
     protected $guesser;
 
+    /**
+     * Indicates that csrf protection enabled
+     *
+     * @var bool
+     */
+    protected $csrfTokenEnabled;
+
     /**
      * @var PagerInterface
      */
@@ -51,12 +58,14 @@ class DatagridBuilder implements DatagridBuilderInterface
      * @param FormFactory $formFactory
      * @param FilterFactoryInterface $filterFactory
      * @param TypeGuesserInterface $guesser
+     * @param bool $csrfTokenEnabled
      */
-    public function __construct(FormFactory $formFactory, FilterFactoryInterface $filterFactory, TypeGuesserInterface $guesser)
+    public function __construct(FormFactory $formFactory, FilterFactoryInterface $filterFactory, TypeGuesserInterface $guesser, $csrfTokenEnabled = true)
     {
         $this->formFactory   = $formFactory;
         $this->filterFactory = $filterFactory;
         $this->guesser       = $guesser;
+        $this->csrfTokenEnabled = $csrfTokenEnabled;
     }
 
     /**
@@ -151,7 +160,12 @@ public function addFilter(DatagridInterface $datagrid, $type = null, FieldDescri
      */
     public function getBaseDatagrid(AdminInterface $admin, array $values = array())
     {
-        $formBuilder = $this->formFactory->createNamedBuilder('filter', 'form', array(), array('csrf_protection' => false));
+        $defaultOptions = array();
+        if ($this->csrfTokenEnabled) {
+            $defaultOptions['csrf_protection'] = false;
+        }
+
+        $formBuilder = $this->formFactory->createNamedBuilder('filter', 'form', array(), $defaultOptions);
 
         return new Datagrid($admin->createQuery(), $admin->getList(), $this->getPager(), $formBuilder, $values);
     }

diff --git a/Resources/config/doctrine_phpcr.xml b/Resources/config/doctrine_phpcr.xml
@@ -49,6 +49,7 @@
             <argument type="service" id="form.factory" />
             <argument type="service" id="sonata.admin.builder.filter.factory" />
             <argument type="service" id="sonata.admin.guesser.doctrine_phpcr_datagrid_chain" />
+            <argument>%form.type_extension.csrf.enabled%</argument>
         </service>
 
         <service id="sonata.admin.guesser.doctrine_phpcr_datagrid" class="Sonata\DoctrinePHPCRAdminBundle\Guesser\FilterTypeGuesser">