trash browsing fix

2026-04-05 18:23:48 +00:00 · 2022-06-12 15:15:25 +02:00
parent 40b746fb78
commit 918c0a6fe9
1 changed files with 5 additions and 1 deletions
--- a/src/Domain/Browsing/Controllers/BrowseTrashController.php
+++ b/src/Domain/Browsing/Controllers/BrowseTrashController.php
@@ -112,7 +112,11 @@ class BrowseTrashController

            $files = File::onlyTrashed()
                ->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()
                ->skip($filesSkip)
                ->take($filesTake)