From f09571e8b2890057fa40c955fa1d4a684ec687b5 Mon Sep 17 00:00:00 2001 From: mirivlad Date: Thu, 2 Apr 2026 09:10:50 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20Null-safe=20=D0=BE=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=D1=82=D0=BE=D1=80=20=D0=B4=D0=BB=D1=8F=20requestedBy=20?= =?UTF-8?q?=D0=B8=20approvedBy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ requestedBy?->name ?? 'Удалён' ✅ approvedBy?->name ?? 'Удалён' Co-authored-by: Qwen-Coder --- resources/views/admin/course-requests/index.blade.php | 2 +- resources/views/admin/course-requests/show.blade.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/admin/course-requests/index.blade.php b/resources/views/admin/course-requests/index.blade.php index dfcb689..e679507 100644 --- a/resources/views/admin/course-requests/index.blade.php +++ b/resources/views/admin/course-requests/index.blade.php @@ -67,7 +67,7 @@ {{ $request->items->count() }} {{ $request->created_at->format('d.m.Y H:i') }} - {{ $request->requestedBy->name }} + {{ $request->requestedBy?->name ?? 'Удалён' }}
diff --git a/resources/views/admin/course-requests/show.blade.php b/resources/views/admin/course-requests/show.blade.php index 836c40c..e7bd3d6 100644 --- a/resources/views/admin/course-requests/show.blade.php +++ b/resources/views/admin/course-requests/show.blade.php @@ -39,9 +39,9 @@ @endif
Создана: {{ $courseRequest->created_at->format('d.m.Y H:i') }}
-
Кем: {{ $courseRequest->requestedBy->name }}
+
Кем: {{ $courseRequest->requestedBy?->name ?? 'Удалён' }}
@if($courseRequest->approved_by) -
{{ $courseRequest->isApproved() ? 'Одобрена' : 'Отклонена' }}: {{ $courseRequest->approvedBy?->name }} {{ $courseRequest->approved_at->format('d.m.Y H:i') }}
+
{{ $courseRequest->isApproved() ? 'Одобрена' : 'Отклонена' }}: {{ $courseRequest->approvedBy?->name ?? 'Удалён' }} {{ $courseRequest->approved_at->format('d.m.Y H:i') }}
@endif @if($courseRequest->note)
Заметка:
{{ $courseRequest->note }}