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

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

View File

@ -54,14 +54,14 @@ class HandleInertiaRequests extends Middleware
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
{
$user = $request->user();
return fn() => $user && $user->can("listAll", VacationRequest::class)
return fn(): ?int => $user && $user->can("listAll", VacationRequest::class)
? VacationRequest::query()
->whereBelongsTo($this->yearPeriodRetriever->selected())
->states(

View File

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

View File

@ -46,4 +46,4 @@ Flatpickr.setDefaults({
disableMobile: true,
})
Settings.defaultLocale = 'pl'
Settings.defaultLocale = 'pl'