kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 19:53:44 +00:00
Code Issues Projects Releases Wiki Activity

Auto commit for release 'develop' on 2025-01-19

Browse Source
This commit is contained in:
github-actions
2025-01-19 11:46:08 +01:00
parent 9d2f57e40a
commit 04d1e8fd59
64 changed files with 3222 additions and 2932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Controllers/Controller.php
View File

@@ -234,7 +234,7 @@ abstract class Controller extends BaseController
final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array
{
$manager = new Manager();
$baseUrl = sprintf('%s/api/v1/',request()->getSchemeAndHttpHost());
$baseUrl = sprintf('%s/api/v1/', request()->getSchemeAndHttpHost());
// TODO add stuff to path?

3
app/Api/V1/Controllers/Models/UserGroup/ShowController.php
View File

@@ -58,6 +58,7 @@ class ShowController extends Controller
return response()
->api($this->jsonApiObject(self::RESOURCE_KEY, $userGroup, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}

13
app/Api/V1/Controllers/Models/UserGroup/UpdateController.php
View File

@@ -1,4 +1,5 @@
<?php
/*
* UpdateController.php
* Copyright (c) 2025 james@firefly-iii.org.
@@ -51,20 +52,20 @@ class UpdateController extends Controller
);
}
public function update(UpdateRequest $request, UserGroup $userGroup): JsonResponse {
public function update(UpdateRequest $request, UserGroup $userGroup): JsonResponse
{
app('log')->debug(sprintf('Now in %s', __METHOD__));
$data = $request->getData();
$userGroup = $this->repository->update($userGroup, $data);
$data = $request->getData();
$userGroup = $this->repository->update($userGroup, $data);
$userGroup->refresh();
app('preferences')->mark();
$transformer = new UserGroupTransformer();
$transformer = new UserGroupTransformer();
$transformer->setParameters($this->parameters);
return response()
->api($this->jsonApiObject(self::RESOURCE_KEY, $userGroup, $transformer))
->header('Content-Type', self::CONTENT_TYPE)
;
;
}
}

2
app/Api/V1/Requests/Data/DateRequest.php
View File

@@ -55,7 +55,7 @@ class DateRequest extends FormRequest
return [
'start' => $start,
'end' => $end,
'date' => $this->getCarbonDate('date'),
'date' => $this->getCarbonDate('date'),
];
}

5
app/Api/V1/Requests/Models/UserGroup/UpdateRequest.php
View File

@@ -25,7 +25,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\UserGroup;
use FireflyIII\Models\UserGroup;
use FireflyIII\Rules\UserGroup\UniqueTitle;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
@@ -41,7 +40,7 @@ class UpdateRequest extends FormRequest
public function getData(): array
{
$fields = [
'title' => ['title', 'convertString'],
'title' => ['title', 'convertString'],
'native_currency_id' => ['native_currency_id', 'convertInteger'],
'native_currency_code' => ['native_currency_code', 'convertString'],
];
@@ -58,7 +57,7 @@ class UpdateRequest extends FormRequest
$userGroup = $this->route()->parameter('userGroup');
return [
'title' => ['required','min:1','max:255'],
'title' => ['required', 'min:1', 'max:255'],
'native_currency_id' => 'exists:transaction_currencies,id',
'native_currency_code' => 'exists:transaction_currencies,code',
];

2
app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php
View File

@@ -66,7 +66,7 @@ class ShowController extends Controller
$default = 1 === $group->pivot->group_default;
}
$currency->userGroupEnabled = $enabled;
$currency->userGroupNative = $default;
$currency->userGroupNative = $default;
$transformer = new CurrencyTransformer();