IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attachments for accounts are visible #2828

Browse Source
This commit is contained in:
James Cole
2020-03-19 18:20:23 +01:00
parent cdf055065f
commit 2a46756838
6 changed files with 69 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Account/ShowController.php
View File

@@ -103,6 +103,7 @@ class ShowController extends Controller
[$start, $end] = [$end, $start]; // @codeCoverageIgnore
}
$location = $this->repository->getLocation($account);
$attachments = $this->repository->getAttachments($account);
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
$today = new Carbon;
$subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type));
@@ -139,6 +140,7 @@ class ShowController extends Controller
'periods',
'subTitleIcon',
'groups',
'attachments',
'subTitle',
'start',
'end',

2
app/Repositories/Account/AccountRepository.php
View File

@@ -311,7 +311,7 @@ class AccountRepository implements AccountRepositoryInterface
$query = $this->user->accounts()->with(
['accountmeta' => function (HasMany $query) {
$query->where('name', 'account_role');
}]
}, 'attachments']
);
if (count($types) > 0) {
$query->accountTypeIn($types);