kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 12:11:19 +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

6
app/Http/Controllers/BudgetController.php
View File

@@ -379,7 +379,7 @@ class BudgetController extends Controller
}
$page = intval($request->get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$pageSize = intval(Preferences::get('listPageSize', 50)->data);
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
@@ -421,7 +421,7 @@ class BudgetController extends Controller
$start = session('first', Carbon::create()->startOfYear());
$end = new Carbon;
$page = intval($request->get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$pageSize = intval(Preferences::get('listPageSize', 50)->data);
$limits = $this->getLimits($budget, $start, $end);
$repetition = null;
// collector:
@@ -452,7 +452,7 @@ class BudgetController extends Controller
}
$page = intval($request->get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$pageSize = intval(Preferences::get('listPageSize', 50)->data);
$subTitle = trans(
'firefly.budget_in_period',
[