From b01d8431c8752551ab313db5c4cd9195f4a9deed Mon Sep 17 00:00:00 2001 From: mirivlad Date: Thu, 2 Apr 2026 09:22:12 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=D0=9E=D1=80=D0=B3=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B1=D0=B5=D1=80=D1=91=D1=82?= =?UTF-8?q?=D1=81=D1=8F=20=D0=B8=D0=B7=20items=5Fjson?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ organization_id из первого элемента items ✅ Удалена валидация organization_id ✅ index.blade.php обрабатывает NULL organization Co-authored-by: Qwen-Coder --- app/Http/Controllers/Admin/CourseRequestController.php | 6 +++--- resources/views/admin/course-requests/index.blade.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/CourseRequestController.php b/app/Http/Controllers/Admin/CourseRequestController.php index efe53f9..2fca551 100755 --- a/app/Http/Controllers/Admin/CourseRequestController.php +++ b/app/Http/Controllers/Admin/CourseRequestController.php @@ -58,7 +58,6 @@ class CourseRequestController extends Controller Gate::authorize('create', CourseRequest::class); $validated = $request->validate([ - 'organization_id' => 'nullable|exists:organizations,id', 'status' => 'nullable|in:pending,approved,rejected', 'note' => 'nullable|string', 'items_json' => 'required|string', @@ -81,8 +80,9 @@ class CourseRequestController extends Controller DB::beginTransaction(); try { - // Определяем организацию из первого элемента или общую - $organizationId = $validated['organization_id'] ?? null; + // Берём organization_id из первого элемента или null + $firstItem = reset($items); + $organizationId = $firstItem['organization_id'] ?? null; // Создаём заявку $courseRequest = CourseRequest::create([ diff --git a/resources/views/admin/course-requests/index.blade.php b/resources/views/admin/course-requests/index.blade.php index e679507..dfc74ff 100644 --- a/resources/views/admin/course-requests/index.blade.php +++ b/resources/views/admin/course-requests/index.blade.php @@ -55,7 +55,7 @@ @forelse($requests as $request) - {{ $request->organization->name }} + {{ $request->organization?->name ?? 'Без организации' }} @if($request->isPending()) Ожидает