kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-27 05:51:56 +00:00
Code Issues Projects Releases Wiki Activity

Fixed a bug where the paginator for transactions would skip pages.

Browse Source
This commit is contained in:
James Cole
2014-11-26 09:43:21 +01:00
parent 114b27079e
commit e235a57e2f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/FireflyIII/Database/TransactionJournal.php
View File

@@ -536,7 +536,7 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
public function getDepositsPaginated($limit = 50) public function getDepositsPaginated($limit = 50)
{ {
$offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0; $offset = intval(\Input::get('page')) > 0 ? (intval(\Input::get('page'))-1) * $limit : 0;
$set = $this->getUser()->transactionJournals()->transactionTypes(['Deposit'])->withRelevantData()->take($limit)->offset($offset)->orderBy( $set = $this->getUser()->transactionJournals()->transactionTypes(['Deposit'])->withRelevantData()->take($limit)->offset($offset)->orderBy(
'date', 'DESC' 'date', 'DESC'
@@ -575,7 +575,7 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
public function getTransfersPaginated($limit = 50) public function getTransfersPaginated($limit = 50)
{ {
$offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0; $offset = intval(\Input::get('page')) > 0 ? (intval(\Input::get('page'))-1) * $limit : 0;
$set = $this->getUser()->transactionJournals()->transactionTypes(['Transfer'])->withRelevantData()->take($limit)->offset($offset)->orderBy( $set = $this->getUser()->transactionJournals()->transactionTypes(['Transfer'])->withRelevantData()->take($limit)->offset($offset)->orderBy(
'date', 'DESC' 'date', 'DESC'
@@ -591,7 +591,7 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
public function getWithdrawalsPaginated($limit = 50) public function getWithdrawalsPaginated($limit = 50)
{ {
$offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0; $offset = intval(\Input::get('page')) > 0 ? (intval(\Input::get('page'))-1) * $limit : 0;
$set = $this->getUser()->transactionJournals()->transactionTypes(['Withdrawal'])->withRelevantData()->take($limit)->offset($offset)->orderBy( $set = $this->getUser()->transactionJournals()->transactionTypes(['Withdrawal'])->withRelevantData()->take($limit)->offset($offset)->orderBy(
'date', 'DESC' 'date', 'DESC'