Merge pull request #1278 from sandergo90/fix/urlchooserajax

[AdminListBundle]: urlchooser ajax requests
Kunstmaan · Aug 29, 2016 · 9020c58 · 9020c58
2 parents 40d7911 + 6477a99
commit 9020c58
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php b/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php
@@ -224,9 +224,12 @@ protected function doEditAction(AbstractAdminListConfigurator $configurator, $en
                 $this->container->get('event_dispatcher')->dispatch(AdminListEvents::POST_EDIT, new AdminListEvent($helper));
                 $indexUrl = $configurator->getIndexUrl();
 
-                return new RedirectResponse(
-                    $this->generateUrl($indexUrl['path'], isset($indexUrl['params']) ? $indexUrl['params'] : array())
-                );
+                // Don't redirect to listing when coming from ajax request, needed for url chooser.
+                if (!$request->isXmlHttpRequest()) {
+                    return new RedirectResponse(
+                        $this->generateUrl($indexUrl['path'], isset($indexUrl['params']) ? $indexUrl['params'] : array())
+                    );
+                }
             }
         }