EZP-31086: Redirect based on router, not url alias (#323)

https://jira.ez.no/browse/EZP-31086
ezsystems · Sep 14, 2020 · e5756b0 · e5756b0
1 parent c95f4dc
commit e5756b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 116 deletions.
diff --git a/bundle/Resources/config/services.yml b/bundle/Resources/config/services.yml
@@ -252,10 +252,6 @@ services:
         tags:
             - { name: kernel.event_subscriber }
 
-    EzSystems\RepositoryForms\Form\Processor\SystemUrlRedirectProcessor:
-        autowire: true
-        autoconfigure: true
-
     # Controllers
     ezrepoforms.controller.content_edit:
         class: "%ezrepoforms.controller.content_edit.class%"

diff --git a/lib/Form/Processor/ContentFormProcessor.php b/lib/Form/Processor/ContentFormProcessor.php
@@ -41,7 +41,6 @@ class ContentFormProcessor implements EventSubscriberInterface
      * @param \eZ\Publish\API\Repository\ContentService $contentService
      * @param \eZ\Publish\API\Repository\LocationService $locationService
      * @param \Symfony\Component\Routing\RouterInterface $router
-     * @param \eZ\Publish\API\Repository\URLAliasService $urlAliasService
      */
     public function __construct(
         ContentService $contentService,
@@ -125,7 +124,7 @@ public function processPublish(FormActionEvent $event)
         $event->setPayload('is_new', $draft->contentInfo->isDraft());
 
         $redirectUrl = $form['redirectUrlAfterPublish']->getData() ?: $this->router->generate(
-            '_ezpublishLocation', [
+            'ez_urlalias', [
                 'locationId' => $content->contentInfo->mainLocationId,
             ]
         );
@@ -146,7 +145,7 @@ public function processCancel(FormActionEvent $event)
 
         if ($data->isNew()) {
             $response = new RedirectResponse($this->router->generate(
-                '_ezpublishLocation',
+                'ez_urlalias',
                 ['locationId' => $data->getLocationStructs()[0]->parentLocationId]
             ));
             $event->setResponse($response);
@@ -171,7 +170,7 @@ public function processCancel(FormActionEvent $event)
         }
 
         $url = $this->router->generate(
-            '_ezpublishLocation',
+            'ez_urlalias',
             ['locationId' => $redirectionLocationId],
             UrlGeneratorInterface::ABSOLUTE_URL
         );

diff --git a/lib/Form/Processor/SystemUrlRedirectProcessor.php b/lib/Form/Processor/SystemUrlRedirectProcessor.php