Merge pull request #11687 from nanaya/turbo-redirect

notbakaneko · web-flow · commit 726937bcde0f · 2024-11-25T17:16:24.000+09:00
Do an explicit turbo visit for redirecting turbo request
diff --git a/app/helpers.php b/app/helpers.php
@@ -942,7 +942,7 @@ function page_title()
 function ujs_redirect($url, $status = 200)
 {
     $request = Request::instance();
-    if ($request->ajax() && !$request->isMethod('get')) {
+    if ($request->headers->get('x-turbo-request-id') !== null || ($request->ajax() && !$request->isMethod('get'))) {
         return ext_view('layout.ujs-redirect', compact('url'), 'js', $status);
     } else {
         // because non-3xx redirects make no sense.

Original file line number	Diff line number	Diff line change
`@@ -942,7 +942,7 @@ function page_title()`
`942`	`942`	`function ujs_redirect($url, $status = 200)`
`943`	`943`	`{`
`944`	`944`	`$request = Request::instance();`
`945`		`- if ($request->ajax() && !$request->isMethod('get')) {`
	`945`	`+ if ($request->headers->get('x-turbo-request-id') !== null \|\| ($request->ajax() && !$request->isMethod('get'))) {`
`946`	`946`	`return ext_view('layout.ujs-redirect', compact('url'), 'js', $status);`
`947`	`947`	`} else {`
`948`	`948`	`// because non-3xx redirects make no sense.`