kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-06-11 04:54:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into adminlte

Browse Source
This commit is contained in:
James Cole
2026-05-31 13:21:13 +02:00
parent fb5869ed72 41ca780790
commit eb05bb419f
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Requests/Models/Recurrence/StoreRequest.php
View File

@@ -85,7 +85,7 @@ class StoreRequest extends FormRequest
'apply_rules' => [new IsBoolean()],
'active' => [new IsBoolean()],
'repeat_until' => ['nullable', 'date'],
'nr_of_repetitions' => ['nullable', 'numeric', 'min:1', 'max:31'],
'nr_of_repetitions' => ['nullable', 'numeric', 'min:1', 'max:255'],
'repetitions.*.type' => ['required', 'in:daily,weekly,ndom,monthly,yearly'],
'repetitions.*.moment' => ['min:0', 'max:10'],

2
app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
View File

@@ -94,7 +94,7 @@ class UpdateRequest extends FormRequest
'apply_rules' => [new IsBoolean()],
'active' => [new IsBoolean()],
'repeat_until' => ['nullable', 'date'],
'nr_of_repetitions' => ['nullable', 'numeric', 'min:1', 'max:31'],
'nr_of_repetitions' => ['nullable', 'numeric', 'min:1', 'max:255'],
'repetitions.*.type' => 'in:daily,weekly,ndom,monthly,yearly',
'repetitions.*.moment' => ['min:0', 'max:10', 'numeric'],

9
app/Http/Controllers/Account/ShowController.php
View File

@@ -83,12 +83,7 @@ final class ShowController extends Controller
* @throws FireflyException
* @throws NotFoundExceptionInterface
*/
public function show(
Request $request,
Account $account,
?Carbon $start = null,
?Carbon $end = null
): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse {
public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse {
if (0 === $account->id) {
throw new NotFoundHttpException();
}
@@ -115,7 +110,7 @@ final class ShowController extends Controller
$attachments = $this->repository->getAttachments($account);
$today = today(config('app.timezone'));
$subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type));
$page = (int) $request->get('page');
$page = (int) $request->input('page');
$pageSize = (int) Preferences::get('listPageSize', 50)->data;
$accountCurrency = $this->repository->getAccountCurrency($account);
$currency = $accountCurrency ?? $this->primaryCurrency;