Skip to content

Firefly III: a personal finances manager

Fix #11144

James Cole8ff40e22e068
diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.php
index dfb16b0eef..01502a60e9 100644
--- a/app/Api/V1/Controllers/Autocomplete/AccountController.php
+++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php
@@ -81,6 +81,7 @@ class AccountController extends Controller
*/
public function accounts(AutocompleteApiRequest $request): JsonResponse
{
+ Log::debug('Before All.');
[
'types' => $types,
'query' => $query,
@@ -89,7 +90,6 @@ class AccountController extends Controller
]
= $request->attributes->all();
-
$date ??= today(config('app.timezone'));
// set date to end-of-day for account balance. so it is at $date 23:59:59
diff --git a/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php b/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php
index 751f9f580b..2d447d6c73 100644
--- a/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php
+++ b/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php
@@ -37,7 +37,7 @@ class AutocompleteApiRequest extends AggregateFormRequest
protected function getRequests(): array
{
return [
- DateRequest::class,
+ DateRequest::class,
[PaginationRequest::class, 'sort_class' => Account::class],
AccountTypesApiRequest::class,
QueryRequest::class,
diff --git a/app/Api/V1/Requests/DateRangeRequest.php b/app/Api/V1/Requests/DateRangeRequest.php
index bfefb467a6..19614e640b 100644
--- a/app/Api/V1/Requests/DateRangeRequest.php
+++ b/app/Api/V1/Requests/DateRangeRequest.php
@@ -40,10 +40,6 @@ class DateRangeRequest extends ApiRequest
$validator->after(
function (Validator $validator): void {
if ($validator->failed()) {
- // set null values
- $this->attributes->set('start', null);
- $this->attributes->set('end', null);
-
return;
}
$start = $this->getCarbonDate('start')?->startOfDay();
diff --git a/app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php b/app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php
index e24a027974..e537f3f45f 100644
--- a/app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php
+++ b/app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php
@@ -47,11 +47,14 @@ class AccountTypesApiRequest extends ApiRequest
if ($validator->failed()) {
return;
}
-
- $type = $this->convertString('types', 'all');
- $this->attributes->add([
- 'types' => $this->mapAccountTypes($type),
- ]);
+ $types = explode(',', $this->convertString('types', 'all'));
+ $result = [];
+ // split and find all types:
+ foreach ($types as $type) {
+ $result = array_merge($result, $this->mapAccountTypes($type));
+ }
+ $result = array_unique($result);
+ $this->attributes->set('types', $result);
}
);
}
diff --git a/app/Api/V1/Requests/PaginationRequest.php b/app/Api/V1/Requests/PaginationRequest.php
index 9b080007dc..d9a59c1969 100644
--- a/app/Api/V1/Requests/PaginationRequest.php
+++ b/app/Api/V1/Requests/PaginationRequest.php
@@ -68,12 +68,10 @@ class PaginationRequest extends ApiRequest
$user = auth()->user();
$limit = (int)Preferences::getForUser($user, 'listPageSize', 50)->data;
}
-
$page = $this->convertInteger('page');
$page = min(max(1, $page), 2 ** 16);
$offset = ($page - 1) * $limit;
$sort = $this->sortClass ? $this->convertSortParameters('sort', $this->sortClass) : $this->get('sort');
-
$this->attributes->set('limit', $limit);
$this->attributes->set('sort', $sort);
$this->attributes->set('page', $page);
diff --git a/changelog.md b/changelog.md
index 41e04f1cbc..69d4ade29a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
+- #11144
- #11147
## 6.4.3 - 2025-11-01