diff --git a/app/Http/Controllers/admin/Catalog/FacultyController.php b/app/Http/Controllers/admin/Catalog/FacultyController.php index 269ed9d..ae0f123 100644 --- a/app/Http/Controllers/admin/Catalog/FacultyController.php +++ b/app/Http/Controllers/admin/Catalog/FacultyController.php @@ -31,7 +31,14 @@ class FacultyController extends Controller { $validated = $request->validated(); - $slug = $validated['slug'] === null ? Str::slug($validated['name']) : $validated['slug']; + if ($validated['slug'] === null) { + $transliterationSlug = Str::slug($validated['name']); + $randomNumber = random_int(100, 999); + $slug = "{$transliterationSlug}-{$randomNumber}"; + } else { + $slug = $validated['slug']; + } + $faculty = new Faculty(); $faculty->name = $validated['name']; $faculty->description = $validated['description']; diff --git a/database/migrations/2024_02_07_073254_create_faculties_table.php b/database/migrations/2024_02_07_073254_create_faculties_table.php index 557e23d..055f47c 100644 --- a/database/migrations/2024_02_07_073254_create_faculties_table.php +++ b/database/migrations/2024_02_07_073254_create_faculties_table.php @@ -10,10 +10,10 @@ return new class extends Migration { Schema::create('faculties', function (Blueprint $table) { $table->id(); - $table->string('name'); + $table->string('name')->unique(); $table->text('description')->nullable(); $table->integer('position'); - $table->string('slug'); + $table->string('slug')->unique(); $table->foreignId('educational_institution_id')->constrained('educational_institutions'); $table->timestamps(); }); diff --git a/resources/views/admin/catalog/faculty/create.blade.php b/resources/views/admin/catalog/faculty/create.blade.php index ca60d06..fb3a279 100644 --- a/resources/views/admin/catalog/faculty/create.blade.php +++ b/resources/views/admin/catalog/faculty/create.blade.php @@ -5,14 +5,17 @@

Создать факультет

- {{ Form::open(['url' => route('faculties.store'), 'method' => 'POST', 'class' => '']) }} + {{ Form::open(['url' => route('faculties.store'), 'method' => 'POST', 'class' => 'needs-validation', 'novalidate']) }}
- {{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.position')]) }} + {{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.position')]) }} *
- {{ Form::number('position', PositionHelper::faculty(), ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.position')]) }} + {{ Form::number('position', PositionHelper::faculty(), ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.position'), 'required']) }} +
+ Поле "Позиция" обязательно! +
@if ($errors->any()) @@ -21,11 +24,14 @@
- {{ Form::label('name', 'Название') }} + {{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.name')]) }} *
- {{ Form::text('name', '', ['class' => 'form-control']) }} + {{ Form::text('name', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.name'), 'required']) }} +
+ Поле "Название" обязательно! +
@if ($errors->any()) @@ -34,10 +40,10 @@
- {{ Form::label('description', 'Описание') }} + {{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.description')]) }}
- {{ Form::text('description', '', ['class' => 'form-control']) }} + {{ Form::text('description', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.description')]) }}
@if ($errors->any()) @@ -45,11 +51,11 @@ @endif
- {{ Form::label('educational_institution_id', 'Учебное заведение') }} + {{ Form::label('educational_institution_id', 'Учебное заведение', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.educational_institution_id')]) }} *
- {{ Form::select('educational_institution_id', $educationalInstitutions, null, ['class' => 'form-select']) }} + {{ Form::select('educational_institution_id', $educationalInstitutions, null, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.educational_institution_id')]) }}
@if ($errors->any()) @@ -57,10 +63,10 @@ @endif
- {{ Form::label('slug', 'URL') }} + {{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
- {{ Form::text('slug', '', ['class' => 'form-control']) }} + {{ Form::text('slug', '', ['class' => 'form-control','data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
@if ($errors->any()) @@ -75,4 +81,22 @@
@endauth + @endsection