nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-17 15:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/folders_upload' into folder_upload_v2

Browse Source 
# Conflicts:
#	composer.lock
#	config/language-translations.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/DesktopToolbar.vue
#	resources/js/helpers.js
#	resources/js/store/modules/fileFunctions.js
#	src/Domain/Files/Actions/UploadFileAction.php
#	src/Domain/Files/Requests/UploadRequest.php
#	tests/Domain/Admin/AdminTest.php
#	tests/Domain/Files/FileTest.php
#	tests/Domain/Folders/FolderTest.php
#	tests/Domain/Sharing/VisitorManipulatingTest.php
#	tests/Domain/Traffic/TrafficTest.php
#	tests/Domain/Trash/TrashTest.php
#	tests/Domain/Zip/UserZippingTest.php
This commit is contained in:
Čarodej
2022-01-24 08:05:04 +01:00
parent 4319533873 e645eebc4d
commit 4396965d4d
17 changed files with 277 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Domain/Files/Actions/UploadFileAction.php
View File

@@ -10,12 +10,14 @@ use Domain\Files\Requests\UploadRequest;
use Domain\Files\Models\File as UserFile;
use Domain\Traffic\Actions\RecordUploadAction;
use App\Users\Exceptions\InvalidUserActionException;
use Domain\Files\Actions\CreateFolderStructureAction;
class UploadFileAction
{
public function __construct(
public RecordUploadAction $recordUpload,
public ProcessImageThumbnailAction $createImageThumbnail,
public CreateFolderStructureAction $createFolderStructure,
public MoveFileToExternalStorageAction $moveFileToExternalStorage,
) {
}
@@ -93,6 +95,7 @@ class UploadFileAction
'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),
'metadata' => $metadata,
'name' => $request->input('filename'),
'basename' => $fileName,