mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-18 16:22:14 +00:00
trash browsing fix
This commit is contained in:
@@ -112,7 +112,11 @@ class BrowseTrashController
|
|||||||
|
|
||||||
$files = File::onlyTrashed()
|
$files = File::onlyTrashed()
|
||||||
->with(['parent'])
|
->with(['parent'])
|
||||||
->where($query['file']['where'])
|
->where('user_id', $userId)
|
||||||
|
->where(function ($query) use ($folders_trashed) {
|
||||||
|
$query->whereNull('parent_id');
|
||||||
|
$query->orWhereNotIn('parent_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))));
|
||||||
|
})
|
||||||
->sortable()
|
->sortable()
|
||||||
->skip($filesSkip)
|
->skip($filesSkip)
|
||||||
->take($filesTake)
|
->take($filesTake)
|
||||||
|
|||||||
Reference in New Issue
Block a user