kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Removed more getJournals functions in favour of the collector.

Browse Source
This commit is contained in:
James Cole
2016-11-06 08:08:06 +01:00
parent 0edffd8ea1
commit 77e2cf40df
14 changed files with 163 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/AccountController.php
View File

@@ -221,7 +221,7 @@ class AccountController extends Controller
$start = session('start', Navigation::startOfPeriod(new Carbon, $range));
/** @var Carbon $end */
$end = session('end', Navigation::endOfPeriod(new Carbon, $range));
$page = intval(Input::get('page'));
$page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
// replace with journal collector:
@@ -275,8 +275,8 @@ class AccountController extends Controller
}
/**
* @param Account $account
* @param string $date
* @param Account $account
* @param string $date
*
* @return View
*/
@@ -287,8 +287,7 @@ class AccountController extends Controller
$start = Navigation::startOfPeriod($carbon, $range);
$end = Navigation::endOfPeriod($carbon, $range);
$subTitle = $account->name . ' (' . Navigation::periodShow($start, $range) . ')';
$page = intval(Input::get('page'));
$page = $page === 0 ? 1 : $page;
$page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
// replace with journal collector: