RomanGolienko
/
Roman_applicant-site
forked from aslan/applicant-site
1
1
Fork 0
Code Pull Requests 2 Activity

prodV1 #2

Open
RomanGolienko wants to merge 309 commits from prodV1 into main
pull from: prodV1
merge into: RomanGolienko:main
Conversation 0 Commits 309 Files Changed 373 +4 -2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d0a9dcae2b - Show all commits

6
app/Http/Controllers/admin/Catalog/DirectionController.php
View File

@ -38,7 +38,8 @@ class DirectionController extends Controller
$subjects = Subject::pluck('name', 'id'); $subjects = Subject::pluck('name', 'id');
$subjectTypes = SubjectType::pluck('name', 'id'); $subjectTypes = SubjectType::pluck('name', 'id');
$directionProfiles = DirectionProfile::pluck('name', 'id'); $directionProfiles = DirectionProfile::pluck('name', 'id');
return view('admin.catalog.direction.create', return view(
'admin.catalog.direction.create',
compact( compact(
'departments', 'departments',
'levels', 'levels',
@ -137,7 +138,8 @@ class DirectionController extends Controller
$subjects = Subject::pluck('name', 'id'); $subjects = Subject::pluck('name', 'id');
$subjectTypes = SubjectType::pluck('name', 'id'); $subjectTypes = SubjectType::pluck('name', 'id');
$directionProfiles = DirectionProfile::pluck('name', 'id'); $directionProfiles = DirectionProfile::pluck('name', 'id');
return view('admin.catalog.direction.edit', return view(
'admin.catalog.direction.edit',
compact( compact(
'direction', 'direction',
'departments', 'departments',