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

Fix #4235

Browse Source
This commit is contained in:
James Cole
2021-01-07 20:31:48 +01:00
parent b040db7976
commit 24b7543f72
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Helpers/Report/PopupReport.php
View File

@@ -27,6 +27,7 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@@ -206,10 +207,17 @@ class PopupReport implements PopupReportInterface
$repository = app(JournalRepositoryInterface::class); $repository = app(JournalRepositoryInterface::class);
$repository->setUser($account->user); $repository->setUser($account->user);
$accountRepository = app(AccountRepositoryInterface::class);
$accountRepository->setUser($account->user);
/** @var GroupCollectorInterface $collector */ /** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class); $collector = app(GroupCollectorInterface::class);
$collector->setAccounts(new Collection([$account])) // set report accounts + the request accounts:
$set = $attributes['accounts'] ?? new Collection;
$set->push($account);
$collector->setBothAccounts($set)
->setRange($attributes['startDate'], $attributes['endDate']) ->setRange($attributes['startDate'], $attributes['endDate'])
->withAccountInformation() ->withAccountInformation()
->withBudgetInformation() ->withBudgetInformation()

2
routes/breadcrumbs.php
View File

@@ -57,7 +57,7 @@ if (!function_exists('limitStringLength')) {
$length = \strlen($string); $length = \strlen($string);
$result = $string; $result = $string;
if ($length > $maxChars) { if ($length > $maxChars) {
$result = substr_replace($string, ' ... ', $maxChars / 2, $length - $maxChars); $result = substr_replace($string, ' ... ', (int)($maxChars / 2), $length - $maxChars);
} }
return $result; return $result;