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

Fix https://github.com/firefly-iii/firefly-iii/issues/8575

Browse Source
This commit is contained in:
James Cole
2024-02-23 17:06:25 +01:00
parent 68c9c4ec3c
commit 5626d1c56d
48 changed files with 329 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Budget/IndexController.php
View File

@@ -278,11 +278,11 @@ class IndexController extends Controller
// also calculate how much left from budgeted:
$sums['left'][$currencyId]
??= [
'amount' => '0',
'currency_id' => $budgeted['currency_id'],
'currency_symbol' => $budgeted['currency_symbol'],
'currency_decimal_places' => $budgeted['currency_decimal_places'],
];
'amount' => '0',
'currency_id' => $budgeted['currency_id'],
'currency_symbol' => $budgeted['currency_symbol'],
'currency_decimal_places' => $budgeted['currency_decimal_places'],
];
}
}

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

@@ -192,11 +192,11 @@ class CategoryController extends Controller
$chartData[$inKey]
= [
'label' => sprintf('%s (%s)', (string)trans('firefly.earned'), $currencyInfo['currency_name']),
'entries' => [],
'type' => 'bar',
'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
];
'label' => sprintf('%s (%s)', (string)trans('firefly.earned'), $currencyInfo['currency_name']),
'entries' => [],
'type' => 'bar',
'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
];
// loop empty periods:
foreach (array_keys($periods) as $period) {
$label = $periods[$period];

3
app/Http/Controllers/JavascriptController.php
View File

@@ -144,6 +144,7 @@ class JavascriptController extends Controller
return response()
->view('v2.javascript.variables', $data)
->header('Content-Type', 'text/javascript');
->header('Content-Type', 'text/javascript')
;
}
}

2
app/Http/Controllers/Rule/CreateController.php
View File

@@ -159,7 +159,7 @@ class CreateController extends Controller
$oldActions = $this->getActionsForBill($bill);
// restore actions and triggers from old input:
if (null !== $request->old()) {
if (null !== $request->old() && is_array($request->old()) && count($request->old()) > 0) {
$oldTriggers = $this->getPreviousTriggers($request);
$oldActions = $this->getPreviousActions($request);
}