Merge 4bfc0c7 into ea2e4f6

sonata-project · Nov 28, 2017 · 03d6f9c · 03d6f9c
2 parents ea2e4f6 + 4bfc0c7
commit 03d6f9c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 25 deletions.
diff --git a/src/Controller/CRUDController.php b/src/Controller/CRUDController.php
@@ -202,10 +202,7 @@ public function batchActionDelete(ProxyQueryInterface $query)
             );
         }
 
-        return new RedirectResponse($this->admin->generateUrl(
-            'list',
-            ['filter' => $this->admin->getFilterParameters()]
-        ));
+        return $this->redirectToList();
     }
 
     /**
@@ -474,12 +471,7 @@ public function batchAction()
                 $this->trans($nonRelevantMessage, [], 'SonataAdminBundle')
             );
 
-            return new RedirectResponse(
-                $this->admin->generateUrl(
-                    'list',
-                    ['filter' => $this->admin->getFilterParameters()]
-                )
-            );
+            return $this->redirectToList();
         }
 
         $askConfirmation = isset($batchActions[$action]['ask_confirmation']) ?
@@ -527,11 +519,7 @@ public function batchAction()
                 $this->trans('flash_batch_no_elements_processed', [], 'SonataAdminBundle')
             );
 
-            return new RedirectResponse(
-                $this->admin->generateUrl('list', [
-                    'filter' => $this->admin->getFilterParameters(),
-                ])
-            );
+            return $this->redirectToList();
         }
 
         return call_user_func([$this, $finalAction], $query, $request);
@@ -1177,10 +1165,10 @@ protected function redirectTo($object)
         $url = false;
 
         if (null !== $request->get('btn_update_and_list')) {
-            $url = $this->admin->generateUrl('list');
+            return $this->redirectToList();
         }
         if (null !== $request->get('btn_create_and_list')) {
-            $url = $this->admin->generateUrl('list');
+            return $this->redirectToList();
         }
 
         if (null !== $request->get('btn_create_and_create')) {
@@ -1192,7 +1180,7 @@ protected function redirectTo($object)
         }
 
         if ('DELETE' === $this->getRestMethod()) {
-            $url = $this->admin->generateUrl('list');
+            return $this->redirectToList();
         }
 
         if (!$url) {
@@ -1206,12 +1194,28 @@ protected function redirectTo($object)
         }
 
         if (!$url) {
-            $url = $this->admin->generateUrl('list');
+            return $this->redirectToList();
         }
 
         return new RedirectResponse($url);
     }
 
+    /**
+     * Redirects the user to the list view.
+     *
+     * @return RedirectResponse
+     */
+    final protected function redirectToList()
+    {
+        $parameters = [];
+
+        if ($filter = $this->admin->getFilterParameters()) {
+            $parameters['filter'] = $filter;
+        }
+
+        return $this->redirect($this->admin->generateUrl('list', $parameters));
+    }
+
     /**
      * Returns true if the preview is requested to be shown.
      *

diff --git a/tests/Controller/CRUDControllerTest.php b/tests/Controller/CRUDControllerTest.php
@@ -3386,7 +3386,7 @@ public function testBatchActionWithoutConfirmation()
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $result);
         $this->assertSame(['flash_batch_delete_success'], $this->session->getFlashBag()->get('sonata_flash_success'));
-        $this->assertSame('list?', $result->getTargetUrl());
+        $this->assertSame('list', $result->getTargetUrl());
     }
 
     /**
@@ -3444,7 +3444,7 @@ public function testBatchActionWithoutConfirmation2()
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $result);
         $this->assertSame(['flash_batch_delete_success'], $this->session->getFlashBag()->get('sonata_flash_success'));
-        $this->assertSame('list?', $result->getTargetUrl());
+        $this->assertSame('list', $result->getTargetUrl());
     }
 
     /**
@@ -3534,7 +3534,7 @@ public function testBatchActionNonRelevantAction()
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $result);
         $this->assertSame(['flash_batch_empty'], $this->session->getFlashBag()->get('sonata_flash_info'));
-        $this->assertSame('list?', $result->getTargetUrl());
+        $this->assertSame('list', $result->getTargetUrl());
     }
 
     /**
@@ -3570,7 +3570,7 @@ public function testBatchActionNonRelevantAction2()
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $result);
         $this->assertSame(['flash_foo_error'], $this->session->getFlashBag()->get('sonata_flash_info'));
-        $this->assertSame('list?', $result->getTargetUrl());
+        $this->assertSame('list', $result->getTargetUrl());
     }
 
     /**
@@ -3603,7 +3603,7 @@ public function testBatchActionNoItems()
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $result);
         $this->assertSame(['flash_batch_empty'], $this->session->getFlashBag()->get('sonata_flash_info'));
-        $this->assertSame('list?', $result->getTargetUrl());
+        $this->assertSame('list', $result->getTargetUrl());
     }
 
     /**
@@ -3709,7 +3709,7 @@ public function testBatchActionWithRequesData()
 
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $result);
         $this->assertSame(['flash_batch_delete_success'], $this->session->getFlashBag()->get('sonata_flash_success'));
-        $this->assertSame('list?', $result->getTargetUrl());
+        $this->assertSame('list', $result->getTargetUrl());
         $this->assertSame('bar', $this->request->request->get('foo'));
     }