prodV1 #2

Open
RomanGolienko wants to merge 309 commits from prodV1 into main
3 changed files with 8 additions and 8 deletions
Showing only changes of commit 75452eff7d - Show all commits

View File

@ -36,9 +36,9 @@ class SubjectTypeController extends Controller
return redirect()->route('subject_types.index');
}
public function show(SubjectType $type): View
public function show(SubjectType $subjectType): View
{
return view('admin.catalog.direction.subject_type.show', compact('type'));
return view('admin.catalog.direction.subject_type.show', compact('subjectType'));
}
public function edit(SubjectType $subjectType): View

View File

@ -8,7 +8,7 @@
->
<a href="{{ route('faculties.show', $faculty) }}">{{ $faculty->name }}</a>
->
<a href="{{ route('faculties.show', $department) }}">{{ $department->name }}</a>
<a href="{{ route('departments.show', $department) }}">{{ $department->name }}</a>
-> {{ $direction->name }}
</h6>

View File

@ -3,15 +3,15 @@
@auth()
<div class="container mt-4">
<h2>Название</h2>
<p>{{ $type->name }}</p>
<p>{{ $subjectType->name }}</p>
<h2>Описание</h2>
<p>{{ $type->description }}</p>
<p>{{ $subjectType->description }}</p>
<h2>URL</h2>
<p>{{ $type->slug }}</p>
<p>{{ $subjectType->slug }}</p>
<h2>Позиция</h2>
<p>{{ $type->position }}</p>
<p>{{ $subjectType->position }}</p>
<h2>Вступительные испытания</h2>
@foreach($type->entranceExaminations as $entranceExamination)
@foreach($subjectType->entranceExaminations as $entranceExamination)
<p><a href="{{ route('entrance_examinations.show', $entranceExamination) }}">{{ $entranceExamination->name }}</a></p>
@endforeach
</div>