Fix: Изменено $category на $courseCategory для соответствия route model binding
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
mirivlad
parent
381c31c686
commit
ca95621856
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
<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">Редактировать: {{ $category->name }}</h1>
|
||||
<a href="{{ route('admin.course-categories.show', $category) }}" class="btn btn-secondary btn-sm">Назад к категории</a>
|
||||
<h1 class="h2">Редактировать: {{ $courseCategory->name }}</h1>
|
||||
<a href="{{ route('admin.course-categories.show', $courseCategory) }}" class="btn btn-secondary btn-sm">Назад к категории</a>
|
||||
</div>
|
||||
<form action="{{ route('admin.course-categories.update', $category) }}" method="POST">
|
||||
<form action="{{ route('admin.course-categories.update', $courseCategory) }}" method="POST">
|
||||
@csrf @method('PUT')
|
||||
<div class="row">
|
||||
<div class="col-md-8">
|
||||
|
|
@ -17,17 +17,17 @@
|
|||
<div class="card-body">
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Название *</label>
|
||||
<input type="text" name="name" class="form-control @error('name') is-invalid @enderror" value="{{ old('name', $category->name) }}" required>
|
||||
<input type="text" name="name" class="form-control @error('name') is-invalid @enderror" value="{{ old('name', $courseCategory->name) }}" required>
|
||||
@error('name')<div class="invalid-feedback">{{ $message }}</div>@enderror
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Slug (URL)</label>
|
||||
<input type="text" name="slug" class="form-control @error('slug') is-invalid @enderror" value="{{ old('slug', $category->slug) }}">
|
||||
<input type="text" name="slug" class="form-control @error('slug') is-invalid @enderror" value="{{ old('slug', $courseCategory->slug) }}">
|
||||
@error('slug')<div class="invalid-feedback">{{ $message }}</div>@enderror
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Описание</label>
|
||||
<textarea name="description" class="form-control" rows="3">{{ old('description', $category->description) }}</textarea>
|
||||
<textarea name="description" class="form-control" rows="3">{{ old('description', $courseCategory->description) }}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -40,16 +40,16 @@
|
|||
<select name="parent_id" class="form-select">
|
||||
<option value="">Без родителя</option>
|
||||
@foreach($parentCategories as $cat)
|
||||
<option value="{{ $cat->id }}" {{ old('parent_id', $category->parent_id) == $cat->id ? 'selected' : '' }}>{{ $cat->name }}</option>
|
||||
<option value="{{ $cat->id }}" {{ old('parent_id', $courseCategory->parent_id) == $cat->id ? 'selected' : '' }}>{{ $cat->name }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Порядок</label>
|
||||
<input type="number" name="sort_order" class="form-control" value="{{ old('sort_order', $category->sort_order) }}">
|
||||
<input type="number" name="sort_order" class="form-control" value="{{ old('sort_order', $courseCategory->sort_order) }}">
|
||||
</div>
|
||||
<div class="form-check mb-3">
|
||||
<input type="checkbox" name="is_active" value="1" class="form-check-input" {{ old('is_active', $category->is_active) ? 'checked' : '' }}>
|
||||
<input type="checkbox" name="is_active" value="1" class="form-check-input" {{ old('is_active', $courseCategory->is_active) ? 'checked' : '' }}>
|
||||
<label class="form-check-label">Активна</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Сохранить</button>
|
||||
<a href="{{ route('admin.course-categories.show', $category) }}" class="btn btn-secondary">Отмена</a>
|
||||
<a href="{{ route('admin.course-categories.show', $courseCategory) }}" class="btn btn-secondary">Отмена</a>
|
||||
</form>
|
||||
</main>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
@extends('layouts.app')
|
||||
@section('title', $category->name)
|
||||
@section('title', $courseCategory->name)
|
||||
@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">{{ $category->name }}</h1>
|
||||
<h1 class="h2">{{ $courseCategory->name }}</h1>
|
||||
<div>
|
||||
@can('update', $category)<a href="{{ route('admin.course-categories.edit', $category) }}" class="btn btn-warning btn-sm me-2">Редактировать</a>@endcan
|
||||
@can('update', $courseCategory)<a href="{{ route('admin.course-categories.edit', $courseCategory) }}" class="btn btn-warning btn-sm me-2">Редактировать</a>@endcan
|
||||
<a href="{{ route('admin.course-categories.index') }}" class="btn btn-secondary btn-sm">Назад</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -18,12 +18,12 @@
|
|||
<div class="card-header bg-primary text-white"><h5 class="mb-0">Информация</h5></div>
|
||||
<div class="card-body">
|
||||
<table class="table table-sm">
|
||||
<tr><th>Название:</th><td>{{ $category->name }}</td></tr>
|
||||
<tr><th>Slug:</th><td><code>{{ $category->slug }}</code></td></tr>
|
||||
<tr><th>Описание:</th><td>{{ $category->description ?? '—' }}</td></tr>
|
||||
<tr><th>Родитель:</th><td>{{ $category->parent?->name ?? '—' }}</td></tr>
|
||||
<tr><th>Порядок:</th><td>{{ $category->sort_order }}</td></tr>
|
||||
<tr><th>Статус:</th><td>@if($category->is_active)<span class="badge bg-success">Активна</span>@else<span class="badge bg-secondary">Не активна</span>@endif</td></tr>
|
||||
<tr><th>Название:</th><td>{{ $courseCategory->name }}</td></tr>
|
||||
<tr><th>Slug:</th><td><code>{{ $courseCategory->slug }}</code></td></tr>
|
||||
<tr><th>Описание:</th><td>{{ $courseCategory->description ?? '—' }}</td></tr>
|
||||
<tr><th>Родитель:</th><td>{{ $courseCategory->parent?->name ?? '—' }}</td></tr>
|
||||
<tr><th>Порядок:</th><td>{{ $courseCategory->sort_order }}</td></tr>
|
||||
<tr><th>Статус:</th><td>@if($courseCategory->is_active)<span class="badge bg-success">Активна</span>@else<span class="badge bg-secondary">Не активна</span>@endif</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -34,11 +34,11 @@
|
|||
<div class="card-body">
|
||||
<div class="row text-center">
|
||||
<div class="col-6 mb-3">
|
||||
<div class="display-4 text-primary">{{ $category->courses->count() }}</div>
|
||||
<div class="display-4 text-primary">{{ $courseCategory->courses->count() }}</div>
|
||||
<div class="text-muted">Курсов</div>
|
||||
</div>
|
||||
<div class="col-6 mb-3">
|
||||
<div class="display-4 text-info">{{ $category->children->count() }}</div>
|
||||
<div class="display-4 text-info">{{ $courseCategory->children->count() }}</div>
|
||||
<div class="text-muted">Подкатегорий</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -46,14 +46,14 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if($category->children->count() > 0)
|
||||
@if($courseCategory->children->count() > 0)
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header"><h5 class="mb-0"><i class="bi bi-folder"></i> Подкатегории</h5></div>
|
||||
<div class="card-body">
|
||||
<ul class="list-group">
|
||||
@foreach($category->children as $child)
|
||||
@foreach($courseCategory->children as $child)
|
||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||
<a href="{{ route('admin.course-categories.show', $child) }}">{{ $child->name }}</a>
|
||||
<span class="badge bg-secondary">{{ $child->courses_count }} курсов</span>
|
||||
|
|
@ -65,19 +65,19 @@
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@if($category->courses->count() > 0)
|
||||
@if($courseCategory->courses->count() > 0)
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header"><h5 class="mb-0"><i class="bi bi-book"></i> Курсы</h5></div>
|
||||
<div class="card-body">
|
||||
<ul class="list-group">
|
||||
@foreach($category->courses->take(10) as $course)
|
||||
@foreach($courseCategory->courses->take(10) as $course)
|
||||
<li class="list-group-item">{{ $course->title }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
@if($category->courses->count() > 10)
|
||||
<div class="mt-2 text-muted small">+ ещё {{ $category->courses->count() - 10 }} курсов</div>
|
||||
@if($courseCategory->courses->count() > 10)
|
||||
<div class="mt-2 text-muted small">+ ещё {{ $courseCategory->courses->count() - 10 }} курсов</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue