Skip to content
Snippets Groups Projects
Commit 0f570b2c authored by David Beniamine's avatar David Beniamine
Browse files

Merge branch...

Merge branch '10-retour-page-1-de-la-liste-des-capsules-lorsque-l-on-change-l-url-de-la-video-d-une-capsule' into 'RC-Rekall-v1.2'

Fix redirect url for capsules url edit

See merge request !102
parents 5745e62e def1c230
No related branches found
No related tags found
1 merge request!102Fix redirect url for capsules url edit
...@@ -120,6 +120,7 @@ class ProjectController extends AbstractController ...@@ -120,6 +120,7 @@ class ProjectController extends AbstractController
throw new \Exception('The retrieved capsule is not an instance of Capsule.'); throw new \Exception('The retrieved capsule is not an instance of Capsule.');
} }
$file_system = new Filesystem(); $file_system = new Filesystem();
$parent_directory_name = $capsule->getLinkPath(); $parent_directory_name = $capsule->getLinkPath();
$parent_directory_exists = $file_system->exists('../legacy/' . $parent_directory_name); $parent_directory_exists = $file_system->exists('../legacy/' . $parent_directory_name);
...@@ -158,6 +159,11 @@ class ProjectController extends AbstractController ...@@ -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', [ return $this->redirectToRoute('capsule_list', [
'capsule_id' => $capsule_id 'capsule_id' => $capsule_id
]); ]);
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</div> </div>
<div class="list-item text-nowrap"> <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"> class="links text-decoration-none">
<i class="fas fa-link m-2"></i> <i class="fas fa-link m-2"></i>
{{ 'capsule.edit.video_url.link'|trans }} {{ 'capsule.edit.video_url.link'|trans }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment