kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Do not return ungrouped piggy banks if none assigned to group

Browse Source
This commit is contained in:
Florian Dupret
2020-08-02 16:29:33 +02:00
parent bb6f4843b9
commit 1338dab5e7
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/PiggyBank/IndexController.php
View File

@@ -89,13 +89,7 @@ class IndexController extends Controller
$parameters->set('end', $end);
// make piggy bank groups:
$piggyBanks = [
0 => [ // the index is the order, not the ID.
'object_group_id' => 0,
'object_group_title' => (string) trans('firefly.default_group_title_name'),
'piggy_banks' => [],
],
];
$piggyBanks = [];
/** @var PiggyBankTransformer $transformer */
$transformer = app(PiggyBankTransformer::class);
@@ -110,8 +104,8 @@ class IndexController extends Controller
$groupOrder = (int) $array['object_group_order'];
// make group array if necessary:
$piggyBanks[$groupOrder] = $piggyBanks[$groupOrder] ?? [
'object_group_id' => $array['object_group_id'],
'object_group_title' => $array['object_group_title'],
'object_group_id' => $array['object_group_id'] ?? 0,
'object_group_title' => $array['object_group_title'] ?? trans('firefly.default_group_title_name'),
'piggy_banks' => [],
];