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

fixes part 2

Browse Source
This commit is contained in:
Čarodej
2022-03-01 10:15:50 +01:00
parent 64d1883f53
commit a303ffffdc
11 changed files with 37 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Domain/Files/Models/File.php
+1 -1
View File
@@ -160,7 +160,7 @@ class File extends Model
// Set shared public url
if ($this->sharedAccess) {
return "$route/$this->sharedAccess";
return "$route/shared/$this->sharedAccess";
}
// Set upload request public url
src/Domain/Teams/Controllers/TeamFoldersController.php
+14 -7
View File
@@ -33,22 +33,29 @@ class TeamFoldersController extends Controller
{
$id = Str::isUuid($id) ? $id : null;
$folders = Folder::where('parent_id', $id)
->where('team_folder', true)
->where('user_id', Auth::id())
->sortable()
->get();
if ($id) {
$folders = Folder::where('parent_id', $id)
->where('team_folder', true)
->sortable()
->get();
$files = File::where('parent_id', $id)
->sortable()
->get();
}
if (!$id) {
$folders = Folder::where('parent_id', null)
->where('team_folder', true)
->where('user_id', Auth::id())
->sortable()
->get();
}
// Collect folders and files to single array
return [
'folders' => new FolderCollection($folders),
'files' => isset($files) ? new FilesCollection($files) : new FilesCollection([]),
'files' => isset($files) ? new FilesCollection($files) : [],
'root' => $id ? new FolderResource(Folder::findOrFail($id)) : null,
'teamFolder' => $id ? new FolderResource(Folder::findOrFail($id)->getLatestParent()) : null,
];
src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
+8 -6
View File
@@ -1,4 +1,5 @@
<?php
namespace Domain\UploadRequest\Controllers;
use DB;
@@ -13,8 +14,7 @@ class UploadFilesForUploadRequestController
{
public function __construct(
private UploadFileAction $uploadFile,
) {
}
) {}
/**
* @throws FileNotFoundException
@@ -64,10 +64,12 @@ class UploadFilesForUploadRequestController
// Create folder
DB::table('folders')->insert([
'id' => $uploadRequest->id,
'parent_id' => $uploadRequest->folder_id ?? null,
'user_id' => $uploadRequest->user_id,
'name' => $uploadRequest->name ?? "Upload Request from $timestampName",
'id' => $uploadRequest->id,
'parent_id' => $uploadRequest->folder_id ?? null,
'user_id' => $uploadRequest->user_id,
'name' => $uploadRequest->name ?? "Upload Request from $timestampName",
'created_at' => now(),
'updated_at' => now(),
]);
// Update upload request status