kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Reinstate sorting.

Browse Source
This commit is contained in:
James Cole
2016-05-11 08:10:05 +02:00
parent 934656c954
commit 9f8faf15f1
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -82,8 +82,6 @@ class CategoryController extends Controller
$data = $this->generator->all($entries);
$cache->store($data);
return ' ' . json_encode($data);
return Response::json($data);
}

2
app/Http/Controllers/TagController.php
View File

@@ -221,7 +221,7 @@ class TagController extends Controller
$subTitle = $tag->tag;
$subTitleIcon = 'fa-tag';
/** @var Collection $journals */
$journals = $tag->transactionjournals()->expanded()->get(TransactionJournal::queryFields());
$journals = $tag->transactionjournals()->sortCorrectly()->expanded()->get(TransactionJournal::queryFields());
$sum = $journals->sum(
function (TransactionJournal $journal) {