merge fixes

This commit is contained in:
Čarodej
2022-01-24 08:35:58 +01:00
parent 4396965d4d
commit 3677e51c8f
9 changed files with 401 additions and 1078 deletions

View File

@@ -94,8 +94,7 @@ class UploadFileAction
return UserFile::create([
'mimetype' => get_file_type_from_mimetype($file_mimetype),
'type' => get_file_type($file_mimetype),
'parent_id' => $request->input('parent_id'),
'parent_id' => ($this->createFolderStructure)($request->input('path'), $request->input('parent_id'), $user_id),
'parent_id' => ($this->createFolderStructure)($request->input('path'), $request->input('parent_id'), $user->id),
'metadata' => $metadata,
'name' => $request->input('filename'),
'basename' => $fileName,