nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-28 19:10:40 +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
app/Http/Controllers/FileBrowser/BrowseController.php
+3 -2
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();
app/Http/Helpers/helpers.php
+3 -3
View File
@@ -418,11 +418,11 @@ function appeared_once($arr)
* @param $folders
* @return array
*/
function filter_folders_ids($folders, $by_column = 'unique_id')
function filter_folders_ids($folders, $by_column = 'id')
{
$folder_unique_ids = recursiveFind($folders->toArray(), $by_column);
$folder_ids = recursiveFind($folders->toArray(), $by_column);
return appeared_once($folder_unique_ids);
return appeared_once($folder_ids);
}
/**