kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-04 05:15:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix pagination of account lists for issue #1040

Browse Source
This commit is contained in:
James Cole
2017-12-21 21:18:30 +01:00
parent 4b869f0d9e
commit b0ecdfe01d
12 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/PreferencesController.php
View File

@@ -96,7 +96,7 @@ class PreferencesController extends Controller
$viewRange = $viewRangePref->data;
$frontPageAccounts = Preferences::get('frontPageAccounts', []);
$language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data;
$transactionPageSize = Preferences::get('transactionPageSize', 50)->data;
$listPageSize = Preferences::get('listPageSize', 50)->data;
$customFiscalYear = Preferences::get('customFiscalYear', 0)->data;
$showDeps = Preferences::get('showDepositsFrontpage', false)->data;
$fiscalYearStartStr = Preferences::get('fiscalYearStart', '01-01')->data;
@@ -114,7 +114,7 @@ class PreferencesController extends Controller
'tjOptionalFields',
'viewRange',
'customFiscalYear',
'transactionPageSize',
'listPageSize',
'fiscalYearStart',
'is2faEnabled',
'has2faSecret',
@@ -175,10 +175,10 @@ class PreferencesController extends Controller
Preferences::set('showDepositsFrontpage', $showDepositsFrontpage);
// save page size:
Preferences::set('transactionPageSize', 50);
$transactionPageSize = intval($request->get('transactionPageSize'));
if ($transactionPageSize > 0 && $transactionPageSize < 1337) {
Preferences::set('transactionPageSize', $transactionPageSize);
Preferences::set('listPageSize', 50);
$listPageSize = intval($request->get('listPageSize'));
if ($listPageSize > 0 && $listPageSize < 1337) {
Preferences::set('listPageSize', $listPageSize);
}
$twoFactorAuthEnabled = false;