IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-18 20:43:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small updates.

Browse Source
This commit is contained in:
James Cole 2017-04-01 08:13:43 +02:00
parent 243530b750
commit 6f933b3bd1
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,8 +114,10 @@ class LoginController extends Controller
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function showLoginForm(Request $request) public function showLoginForm(Request $request, CookieJar $cookieJar)
{ {
// forget 2fa cookie:
$cookie = $cookieJar->forever('twoFactorAuthenticated', 'false');
// is allowed to? // is allowed to?
$singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data; $singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
$userCount = User::count(); $userCount = User::count();
@ -127,7 +129,7 @@ class LoginController extends Controller
$email = $request->old('email'); $email = $request->old('email');
$remember = $request->old('remember'); $remember = $request->old('remember');
return view('auth.login', compact('allowRegistration', 'email', 'remember')); return view('auth.login', compact('allowRegistration', 'email', 'remember'))->withCookie($cookie);
} }
/** /**

2
resources/views/list/piggy-banks.twig
View File

@ -32,7 +32,7 @@
</div> </div>
</td> </td>
<td> <td>
<a href="{{ route('piggy-banks.show', piggyBank.id) }}" title="{{ piggyBank.name }}">{{ piggyBank.name }}</a> <a href="{{ route('piggy-banks.show', piggyBank.id) }}" title="{{ piggyBank.account.name }}">{{ piggyBank.name }}</a>
</td> </td>
<td style="text-align: right;"> <td style="text-align: right;">
<span title="Saved so far" style="text-align:right;">{{ piggyBank.savedSoFar|formatAmount }}</span> <span title="Saved so far" style="text-align:right;">{{ piggyBank.savedSoFar|formatAmount }}</span>