diff --git a/app/Http/Controllers/Admin/CourseCategoryController.php b/app/Http/Controllers/Admin/CourseCategoryController.php index a2b541a..327a120 100755 --- a/app/Http/Controllers/Admin/CourseCategoryController.php +++ b/app/Http/Controllers/Admin/CourseCategoryController.php @@ -56,25 +56,25 @@ class CourseCategoryController extends Controller ->with('success', 'Категория успешно создана.'); } - public function show(CourseCategory $category) + public function show(CourseCategory $courseCategory) { - Gate::authorize('view', $category); + Gate::authorize('view', $courseCategory); - $category->load(['parent', 'children', 'courses']); + $courseCategory->load(['parent', 'children', 'courses']); - return view('admin.course-categories.show', compact('category')); + return view('admin.course-categories.show', compact('courseCategory')); } - public function edit(CourseCategory $category) + public function edit(CourseCategory $courseCategory) { - Gate::authorize('update', $category); + Gate::authorize('update', $courseCategory); $parentCategories = CourseCategory::whereNull('parent_id') - ->where('id', '!=', $category->id) + ->where('id', '!=', $courseCategory->id) ->orderBy('name') ->get(); - return view('admin.course-categories.edit', compact('category', 'parentCategories')); + return view('admin.course-categories.edit', compact('courseCategory', 'parentCategories')); } public function update(Request $request, CourseCategory $category) diff --git a/resources/views/admin/course-categories/edit.blade.php b/resources/views/admin/course-categories/edit.blade.php index a3700d2..c0ab4f4 100644 --- a/resources/views/admin/course-categories/edit.blade.php +++ b/resources/views/admin/course-categories/edit.blade.php @@ -6,10 +6,10 @@
-

Редактировать: {{ $category->name }}

- Назад к категории +

Редактировать: {{ $courseCategory->name }}

+ Назад к категории
-
+ @csrf @method('PUT')
@@ -17,17 +17,17 @@
- + @error('name')
{{ $message }}
@enderror
- + @error('slug')
{{ $message }}
@enderror
- +
@@ -40,16 +40,16 @@
- +
- is_active) ? 'checked' : '' }}> + is_active) ? 'checked' : '' }}>
@@ -57,7 +57,7 @@ - Отмена + Отмена
diff --git a/resources/views/admin/course-categories/show.blade.php b/resources/views/admin/course-categories/show.blade.php index 4c7fb7a..30795ad 100644 --- a/resources/views/admin/course-categories/show.blade.php +++ b/resources/views/admin/course-categories/show.blade.php @@ -1,14 +1,14 @@ @extends('layouts.app') -@section('title', $category->name) +@section('title', $courseCategory->name) @section('content')
-

{{ $category->name }}

+

{{ $courseCategory->name }}

- @can('update', $category)Редактировать@endcan + @can('update', $courseCategory)Редактировать@endcan Назад
@@ -18,12 +18,12 @@
Информация
- - - - - - + + + + + +
Название:{{ $category->name }}
Slug:{{ $category->slug }}
Описание:{{ $category->description ?? '—' }}
Родитель:{{ $category->parent?->name ?? '—' }}
Порядок:{{ $category->sort_order }}
Статус:@if($category->is_active)Активна@elseНе активна@endif
Название:{{ $courseCategory->name }}
Slug:{{ $courseCategory->slug }}
Описание:{{ $courseCategory->description ?? '—' }}
Родитель:{{ $courseCategory->parent?->name ?? '—' }}
Порядок:{{ $courseCategory->sort_order }}
Статус:@if($courseCategory->is_active)Активна@elseНе активна@endif
@@ -34,11 +34,11 @@
-
{{ $category->courses->count() }}
+
{{ $courseCategory->courses->count() }}
Курсов
-
{{ $category->children->count() }}
+
{{ $courseCategory->children->count() }}
Подкатегорий
@@ -46,14 +46,14 @@
- @if($category->children->count() > 0) + @if($courseCategory->children->count() > 0)
Подкатегории
    - @foreach($category->children as $child) + @foreach($courseCategory->children as $child)
  • {{ $child->name }} {{ $child->courses_count }} курсов @@ -65,19 +65,19 @@
@endif - @if($category->courses->count() > 0) + @if($courseCategory->courses->count() > 0)
Курсы
    - @foreach($category->courses->take(10) as $course) + @foreach($courseCategory->courses->take(10) as $course)
  • {{ $course->title }}
  • @endforeach
- @if($category->courses->count() > 10) -
+ ещё {{ $category->courses->count() - 10 }} курсов
+ @if($courseCategory->courses->count() > 10) +
+ ещё {{ $courseCategory->courses->count() - 10 }} курсов
@endif