kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Various layout updates and tiny upgrade fixes [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-09-16 13:29:56 +02:00
parent c123e1044a
commit aac0c9ab98
7 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,7 +104,7 @@ class LoginController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function showLoginForm()
public function showLoginForm(Request $request)
{
// is allowed to?
$singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
@@ -114,7 +114,10 @@ class LoginController extends Controller
$allowRegistration = false;
}
return view('auth.login', compact('allowRegistration'));
$email = $request->old('email');
$remember = $request->old('remember');
return view('auth.login', compact('allowRegistration', 'email', 'remember'));
}
/**

6
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -109,7 +109,7 @@ class RegisterController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function showRegistrationForm()
public function showRegistrationForm(Request $request)
{
// TODO move to FireflyConfig
$showDemoWarning = env('SHOW_DEMO_WARNING', false);
@@ -123,7 +123,9 @@ class RegisterController extends Controller
return view('error', compact('message'));
}
return view('auth.register', compact('showDemoWarning'));
$email = $request->old('email');
return view('auth.register', compact('showDemoWarning', 'email'));
}
/**