kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

Merge remote-tracking branch 'origin/#90-user-profile' into #90-user-profile

Browse Source
This commit is contained in:
Adrian Hopek 2022-04-14 11:37:25 +02:00
commit 680c512d15
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
View File

@ -54,14 +54,14 @@ class HandleInertiaRequests extends Middleware
protected function getYearsData(Request $request): Closure protected function getYearsData(Request $request): Closure
{ {
return fn() => $request->user() ? $this->yearPeriodRetriever->links() : []; return fn(): array => $request->user() ? $this->yearPeriodRetriever->links() : [];
} }
protected function getVacationRequestsCount(Request $request): Closure protected function getVacationRequestsCount(Request $request): Closure
{ {
$user = $request->user(); $user = $request->user();
return fn() => $user && $user->can("listAll", VacationRequest::class) return fn(): ?int => $user && $user->can("listAll", VacationRequest::class)
? VacationRequest::query() ? VacationRequest::query()
->whereBelongsTo($this->yearPeriodRetriever->selected()) ->whereBelongsTo($this->yearPeriodRetriever->selected())
->states( ->states(

2
resources/js/Shared/InertiaLink.js
View File

@ -53,7 +53,7 @@ export default {
replace: props.replace, replace: props.replace,
preserveScroll: props.preserveScroll, preserveScroll: props.preserveScroll,
preserveState: props.preserveState ?? (method !== 'get'), preserveState: props.preserveState ?? (method !== 'get'),
onBefore: () => ! processing.value, onBefore: () => !processing.value,
onStart: () => processing.value = true, onStart: () => processing.value = true,
onFinish: () => processing.value = false, onFinish: () => processing.value = false,
}) })