diff --git a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php index ac4999f843..f0aae18652 100644 --- a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php @@ -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'], diff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php index 7004db0a4d..5bf4ebceba 100644 --- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php @@ -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'], diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 3cd5f9d1f8..60587cc30a 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -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;