Merge pull request #36 from rn0/fix

Remove unnecessary code. Fix invalid route
fsi-open · Feb 27, 2015 · b181355 · b181355
2 parents 3e5520b + 1a73212
commit b181355
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 121 deletions.
diff --git a/Doctrine/Admin/Context/Request/FormValidRequestHandler.php b/Doctrine/Admin/Context/Request/FormValidRequestHandler.php
diff --git a/Doctrine/Admin/TranslatableBatchElement.php b/Doctrine/Admin/TranslatableBatchElement.php
@@ -29,7 +29,7 @@ public function setLocaleManager(LocaleManager $localeManager)
 
     public function getRoute()
     {
-        return 'fsi_admin_batch';
+        return 'getSuccessRouteParameters';
     }
 
     public function getRouteParameters()
@@ -47,7 +47,7 @@ public function getSuccessRoute()
 
     public function getSuccessRouteParameters()
     {
-        $parameters = parent::getRouteParameters();
+        $parameters = parent::getSuccessRouteParameters();
         $parameters['locale'] = $this->localeManager->getLocale();;
 
         return $parameters;

diff --git a/Doctrine/Admin/TranslatableCRUDElement.php b/Doctrine/Admin/TranslatableCRUDElement.php
@@ -56,6 +56,9 @@ public function getSuccessRoute()
      */
     public function getSuccessRouteParameters()
     {
-        return $this->getRouteParameters();
+        $parameters = parent::getSuccessRouteParameters();
+        $parameters['locale'] = $this->localeManager->getLocale();;
+
+        return $parameters;
     }
 }
diff --git a/Doctrine/Admin/TranslatableFormElement.php b/Doctrine/Admin/TranslatableFormElement.php
@@ -59,7 +59,7 @@ public function getSuccessRoute()
      */
     public function getSuccessRouteParameters()
     {
-        $parameters = parent::getRouteParameters();
+        $parameters = parent::getSuccessRouteParameters();
         $parameters['locale'] = $this->localeManager->getLocale();;
 
         return $parameters;

diff --git a/Doctrine/Admin/TranslatableResourceElement.php b/Doctrine/Admin/TranslatableResourceElement.php
@@ -45,4 +45,12 @@ public function getRouteParameters()
 
         return $routeParameters;
     }
+
+    public function getSuccessRouteParameters()
+    {
+        $parameters = parent::getSuccessRouteParameters();
+        $parameters['locale'] = $this->localeManager->getLocale();;
+
+        return $parameters;
+    }
 }
diff --git a/Resources/config/context/form.xml b/Resources/config/context/form.xml
@@ -7,7 +7,6 @@
     <parameters>
         <parameter key="admin_translatable.context.form.class">FSi\Bundle\AdminTranslatableBundle\Doctrine\Admin\Context\FormElementContext</parameter>
         <parameter key="admin_translatable.context_builder.form.class">FSi\Bundle\AdminTranslatableBundle\Doctrine\Admin\Context\FormElementContextBuilder</parameter>
-        <parameter key="admin_translatable.context.form.request_handler.form_valid_request.class">FSi\Bundle\AdminTranslatableBundle\Doctrine\Admin\Context\Request\FormValidRequestHandler</parameter>
     </parameters>
 
     <services>
@@ -23,15 +22,9 @@
         <service id="admin_translatable.context.form" class="%admin_translatable.context.form.class%">
             <argument type="collection">
                 <argument type="service" id="admin.context.form.request_handler.form_submit"/>
-                <argument type="service" id="admin_translatable.context.form.request_handler.form_valid_request"/>
+                <argument type="service" id="admin.context.form.request_handler.form_valid_request"/>
             </argument>
             <argument type="service" id="admin_translatable.manager.locale" />
         </service>
-
-        <service id="admin_translatable.context.form.request_handler.form_valid_request"
-                 class="%admin_translatable.context.form.request_handler.form_valid_request.class%">
-            <argument type="service" id="event_dispatcher" />
-            <argument type="service" id="router" />
-        </service>
     </services>
 </container>
diff --git a/...le/AdminTranslatableBundle/Doctrine/Admin/Context/Request/FormValidRequestHandlerSpec.php b/...le/AdminTranslatableBundle/Doctrine/Admin/Context/Request/FormValidRequestHandlerSpec.php