kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +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

3
app/Api/V2/Controllers/Transaction/List/TransactionController.php
View File

@@ -112,6 +112,7 @@ class TransactionController extends Controller
return response() return response()
->json($this->jsonApiList('transactions', $paginator, new TransactionGroupTransformer())) ->json($this->jsonApiList('transactions', $paginator, new TransactionGroupTransformer()))
->header('Content-Type', self::CONTENT_TYPE); ->header('Content-Type', self::CONTENT_TYPE)
;
} }
} }

3
app/Helpers/Collector/GroupCollector.php
View File

@@ -1083,7 +1083,8 @@ class GroupCollector implements GroupCollectorInterface
// include budget ID + name (if any) // include budget ID + name (if any)
->withBudgetInformation() ->withBudgetInformation()
// include bill ID + name (if any) // include bill ID + name (if any)
->withBillInformation(); ->withBillInformation()
;
return $this; return $this;
} }

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

@@ -144,6 +144,7 @@ class JavascriptController extends Controller
return response() return response()
->view('v2.javascript.variables', $data) ->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); $oldActions = $this->getActionsForBill($bill);
// restore actions and triggers from old input: // 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); $oldTriggers = $this->getPreviousTriggers($request);
$oldActions = $this->getPreviousActions($request); $oldActions = $this->getPreviousActions($request);
} }

3
app/Validation/FireflyValidator.php
View File

@@ -824,7 +824,8 @@ class FireflyValidator extends Validator
->where('trigger', $trigger) ->where('trigger', $trigger)
->where('response', $response) ->where('response', $response)
->where('delivery', $delivery) ->where('delivery', $delivery)
->where('url', $url)->count(); ->where('url', $url)->count()
;
} }
return false; return false;