diff --git a/app/Http/Controllers/FileController.php b/app/Http/Controllers/FileController.php index 25e4deb..75ded4a 100644 --- a/app/Http/Controllers/FileController.php +++ b/app/Http/Controllers/FileController.php @@ -35,9 +35,8 @@ class FileController extends Controller abort_if(Auth::guest(), 403); $receptionScreens = ReceptionScreen::pluck('name', 'id'); - $idsReceptionScreens = $receptionScreens->keys()->toArray(); $files = File::where('reception_screen_id', '=', $idReceptionScreen)->get(); - return view('files.create', compact('receptionScreens', 'idsReceptionScreens', 'idReceptionScreen', 'files')); + return view('files.create', compact('receptionScreens', 'idReceptionScreen', 'files')); } public function store(StoreFileRequest $request) diff --git a/app/Models/File.php b/app/Models/File.php index 61ba6cd..bd9c20b 100644 --- a/app/Models/File.php +++ b/app/Models/File.php @@ -13,6 +13,7 @@ class File extends Model protected $fillable = [ 'id', 'name', + 'file_name', 'url', 'description', ]; diff --git a/database/migrations/2024_01_22_074748_create_files_table.php b/database/migrations/2024_01_22_074748_create_files_table.php index 4656e1f..d816926 100644 --- a/database/migrations/2024_01_22_074748_create_files_table.php +++ b/database/migrations/2024_01_22_074748_create_files_table.php @@ -14,6 +14,7 @@ return new class extends Migration Schema::create('files', function (Blueprint $table) { $table->id(); $table->string('name'); + $table->string('file_name')->nullable(); $table->string('description')->nullable(); $table->string('url'); $table->integer('position'); diff --git a/resources/views/files/create.blade.php b/resources/views/files/create.blade.php index a9fafde..8a11f96 100644 --- a/resources/views/files/create.blade.php +++ b/resources/views/files/create.blade.php @@ -42,7 +42,7 @@ {{ Form::label('idReceptionScreen', 'Пункт экрана приема') }}
- {{ Form::select('idReceptionScreen', $receptionScreens, $idReceptionScreen, $idsReceptionScreens,['class' => 'form-select']) }} + {{ Form::select('idReceptionScreen', $receptionScreens, $idReceptionScreen, ['class' => 'form-select']) }}
@if ($errors->any())