github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-25 13:44:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Recall previous route when manually clicking login

Browse Source
This commit is contained in:
Daniel Seiler 2019-12-14 08:16:48 +01:00
parent 02af69ddf2
commit afa501e75b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Auth/LoginController.php
View File

@ -128,6 +128,10 @@ class LoginController extends Controller
]); ]);
} }
if ($request->has('intended')) {
redirect()->setIntendedUrl($request->get('intended'));
}
return view('auth.login', [ return view('auth.login', [
'socialDrivers' => $socialDrivers, 'socialDrivers' => $socialDrivers,
'authMethod' => $authMethod, 'authMethod' => $authMethod,

2
resources/views/common/header.blade.php
View File

@ -45,7 +45,7 @@
@if(setting('registration-enabled', false)) @if(setting('registration-enabled', false))
<a href="{{ url('/register') }}">@icon('new-user') {{ trans('auth.sign_up') }}</a> <a href="{{ url('/register') }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
@endif @endif
<a href="{{ url('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a> <a href="{{ action('Auth\LoginController@getLogin', ['intended' => url()->current()]) }}">@icon('login') {{ trans('auth.log_in') }}</a>
@endif @endif
</div> </div>
@if(signedInUser()) @if(signedInUser())