From cb87a765705e24fa2334eb024b71d18edb886693 Mon Sep 17 00:00:00 2001
From: mirivlad <mirivlad@lms.local>
Date: Tue, 31 Mar 2026 08:53:46 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=D0=9C=D0=B0=D1=80=D1=88=D1=80=D1=83?=
 =?UTF-8?q?=D1=82=20show=20=D1=81=20{course}=20=D0=BF=D0=B0=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
---
 .../Controllers/Admin/CourseAssignmentController.php   |  8 ++++----
 .../views/admin/course-assignments/show.blade.php      | 10 +++++-----
 routes/web.php                                         |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Admin/CourseAssignmentController.php b/app/Http/Controllers/Admin/CourseAssignmentController.php
index ca18b71..e2059b9 100755
--- a/app/Http/Controllers/Admin/CourseAssignmentController.php
+++ b/app/Http/Controllers/Admin/CourseAssignmentController.php
@@ -155,14 +155,14 @@ class CourseAssignmentController extends Controller
             ->with('success', "Создано назначений: {$created}");
     }
 
-    public function show(Request $request, $course_id)
+    public function show(Request $request, $course)
     {
         Gate::authorize('viewAny', CourseAssignment::class);
         
         $start_date = $request->get('start');
         $end_date = $request->get('end') !== 'null' ? $request->get('end') : null;
         
-        $query = CourseAssignment::where('course_id', $course_id)
+        $query = CourseAssignment::where('course_id', $course)
             ->where('start_date', $start_date);
         
         if ($end_date) {
@@ -172,14 +172,14 @@ class CourseAssignmentController extends Controller
         }
         
         $assignments = $query->with(['course', 'user', 'group', 'organization', 'creator'])->get();
-        $course = $assignments->first()?->course;
+        $courseModel = $assignments->first()?->course ?? Course::find($course);
         
         // Группируем по типам
         $individual = $assignments->where('type', 'individual');
         $groups = $assignments->where('type', 'group');
         $organizations = $assignments->where('type', 'organization');
         
-        return view('admin.course-assignments.show', compact('course', 'assignments', 'individual', 'groups', 'organizations', 'start_date', 'end_date'));
+        return view('admin.course-assignments.show', compact('courseModel', 'assignments', 'individual', 'groups', 'organizations', 'start_date', 'end_date'));
     }
 
     public function destroy(CourseAssignment $course_assignment)
diff --git a/resources/views/admin/course-assignments/show.blade.php b/resources/views/admin/course-assignments/show.blade.php
index 4009e23..8268a66 100644
--- a/resources/views/admin/course-assignments/show.blade.php
+++ b/resources/views/admin/course-assignments/show.blade.php
@@ -1,12 +1,12 @@
 @extends('layouts.app')
-@section('title', 'Назначение: ' . $course->title)
+@section('title', 'Назначение: ' . $courseModel->title)
 @section('content')
 <div class="container-fluid">
     <div class="row">
         <nav class="col-md-3 col-lg-2 d-md-block sidebar"><div class="position-sticky pt-3">@include('partials._sidebar')</div></nav>
         <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
             <div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
-                <h1 class="h2">{{ $course->title }}</h1>
+                <h1 class="h2">{{ $courseModel->title }}</h1>
                 <a href="{{ route('admin.course-assignments.index') }}" class="btn btn-secondary btn-sm">Назад</a>
             </div>
             
@@ -132,7 +132,7 @@
         <div class="modal-content">
             <form action="{{ route('admin.course-assignments.store') }}" method="POST">
                 @csrf
-                <input type="hidden" name="course_ids" value="{{ $course->id }}">
+                <input type="hidden" name="course_ids" value="{{ $courseModel->id }}">
                 <input type="hidden" name="start_date" value="{{ $start_date }}">
                 <input type="hidden" name="end_date" value="{{ $end_date }}">
                 <div class="modal-header">
@@ -157,7 +157,7 @@
         <div class="modal-content">
             <form action="{{ route('admin.course-assignments.store') }}" method="POST">
                 @csrf
-                <input type="hidden" name="course_ids" value="{{ $course->id }}">
+                <input type="hidden" name="course_ids" value="{{ $courseModel->id }}">
                 <input type="hidden" name="start_date" value="{{ $start_date }}">
                 <input type="hidden" name="end_date" value="{{ $end_date }}">
                 <div class="modal-header">
@@ -182,7 +182,7 @@
         <div class="modal-content">
             <form action="{{ route('admin.course-assignments.store') }}" method="POST">
                 @csrf
-                <input type="hidden" name="course_ids" value="{{ $course->id }}">
+                <input type="hidden" name="course_ids" value="{{ $courseModel->id }}">
                 <input type="hidden" name="start_date" value="{{ $start_date }}">
                 <input type="hidden" name="end_date" value="{{ $end_date }}">
                 <div class="modal-header">
diff --git a/routes/web.php b/routes/web.php
index 370c5ef..96741c5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -52,7 +52,8 @@ Route::middleware('auth')->group(function () {
         Route::resource('courses', CourseController::class);
         Route::resource('courses.tests', TestController::class);
         Route::resource('tests.questions', QuestionController::class);
-        Route::resource('course-assignments', CourseAssignmentController::class);
+        Route::resource('course-assignments', CourseAssignmentController::class)->except(['show', 'edit', 'update']);
+        Route::get('/course-assignments/{course}', CourseAssignmentController::class . '@show')->name('course-assignments.show');
         Route::resource('groups', GroupUserController::class);
         Route::post('/users/{user}/groups/add', [GroupUserController::class, 'addUser'])->name('groups.users.add');
         Route::delete('/groups/{group}/users/{user}/remove', [GroupUserController::class, 'removeUser'])->name('groups.users.remove');