From def1c230ba7ecf605e1192161da4708229cfed50 Mon Sep 17 00:00:00 2001
From: Sebastien Curt <sebastien.curt@tetras-libre.fr>
Date: Mon, 4 Jul 2022 15:10:16 +0200
Subject: [PATCH] Fix redirect url for capsules url edit
---
src/Controller/ProjectController.php | 6 ++++++
templates/capsule/index.html.twig | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php
index 3b3afeb..5d81190 100755
--- a/src/Controller/ProjectController.php
+++ b/src/Controller/ProjectController.php
@@ -120,6 +120,7 @@ class ProjectController extends AbstractController
throw new \Exception('The retrieved capsule is not an instance of Capsule.');
}
+
$file_system = new Filesystem();
$parent_directory_name = $capsule->getLinkPath();
$parent_directory_exists = $file_system->exists('../legacy/' . $parent_directory_name);
@@ -158,6 +159,11 @@ class ProjectController extends AbstractController
)
);
+ $url_redirect = $request->query->get('returnUrl');
+ if ($url_redirect) {
+ return $this->redirect($url_redirect);
+ }
+
return $this->redirectToRoute('capsule_list', [
'capsule_id' => $capsule_id
]);
diff --git a/templates/capsule/index.html.twig b/templates/capsule/index.html.twig
index 3bc0322..01397bd 100644
--- a/templates/capsule/index.html.twig
+++ b/templates/capsule/index.html.twig
@@ -96,7 +96,7 @@
</div>
<div class="list-item text-nowrap">
- <a href="{{ path('edit_video_url', {'capsule_id': capsule.getId()}) }}"
+ <a href="{{ path('edit_video_url', {'capsule_id': capsule.getId(), 'returnUrl': app.request.requesturi }) }}"
class="links text-decoration-none">
<i class="fas fa-link m-2"></i>
{{ 'capsule.edit.video_url.link'|trans }}
--
GitLab