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

added it_get_trash_root

Browse Source
This commit is contained in:
Peter Papp
2021-03-01 16:59:57 +01:00
parent d8b279479a
commit 2007279a69
4 changed files with 99 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/FileBrowser/BrowseController.php
View File

@@ -29,12 +29,12 @@ class BrowseController extends Controller
$folders_trashed = Folder::onlyTrashed()
->with(['trashed_folders', 'parent'])
->where('user_id', $user_id)
->get(['parent_id', 'unique_id', 'name']);
->get(['parent_id', 'id', 'name']);
$folders = Folder::onlyTrashed()
->with(['parent'])
->where('user_id', $user_id)
->whereIn('unique_id', filter_folders_ids($folders_trashed))
->whereIn('id', filter_folders_ids($folders_trashed))
->sortable()
->get();
@@ -42,6 +42,7 @@ class BrowseController extends Controller
$files_trashed = File::onlyTrashed()
->with(['parent'])
->where('user_id', $user_id)
->whereNull('folder_id')
->whereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'unique_id'))))
->sortable()
->get();