From adbe35e8b5be321decae9732706257502dbd76d6 Mon Sep 17 00:00:00 2001 From: Peter Papp Date: Tue, 16 Mar 2021 10:30:36 +0100 Subject: [PATCH] trash fixed --- app/Console/Commands/SetupDevEnvironment.php | 6 ++++-- .../Controllers/FileManager/BrowseController.php | 6 ++++-- storage/demo/app/favicon.png | Bin 0 -> 3513 bytes tests/Feature/FileManager/BrowseTest.php | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 storage/demo/app/favicon.png diff --git a/app/Console/Commands/SetupDevEnvironment.php b/app/Console/Commands/SetupDevEnvironment.php index 1b0d826b..1e8a80e6 100644 --- a/app/Console/Commands/SetupDevEnvironment.php +++ b/app/Console/Commands/SetupDevEnvironment.php @@ -184,6 +184,7 @@ class SetupDevEnvironment extends Command ->create([ 'type' => 'folder', 'item_id' => $shared_folder->id, + 'user_id' => $user->id, 'permission' => 'editor', 'is_protected' => false, 'password' => null, @@ -318,6 +319,7 @@ class SetupDevEnvironment extends Command ->create([ 'type' => 'folder', 'item_id' => $documents->id, + 'user_id' => $user->id, 'permission' => 'editor', 'is_protected' => false, 'password' => null, @@ -722,7 +724,7 @@ class SetupDevEnvironment extends Command ], [ 'name' => 'app_favicon', - 'value' => null, + 'value' => 'system/favicon.png', ], [ 'name' => 'google_analytics', @@ -764,7 +766,7 @@ class SetupDevEnvironment extends Command }); // Get system images - collect(['logo.svg', 'logo-horizontal.svg']) + collect(['logo.svg', 'logo-horizontal.svg', 'favicon.png']) ->each(function ($file) { \File::copy(storage_path("demo/app/$file"), storage_path("app/system/$file")); }); diff --git a/app/Http/Controllers/FileManager/BrowseController.php b/app/Http/Controllers/FileManager/BrowseController.php index de7514b9..57d69ddc 100644 --- a/app/Http/Controllers/FileManager/BrowseController.php +++ b/app/Http/Controllers/FileManager/BrowseController.php @@ -105,8 +105,10 @@ class BrowseController extends Controller $files_trashed = File::onlyTrashed() ->with(['parent']) ->where('user_id', $user_id) - ->whereNull('folder_id') - ->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id')))) + ->where(function($query) use ($folders_trashed) { + $query->whereNull('folder_id'); + $query->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id')))); + }) ->sortable() ->get(); diff --git a/storage/demo/app/favicon.png b/storage/demo/app/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..c01944463743817ee69b50f748ebca1dde576d4b GIT binary patch literal 3513 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 literal 0 HcmV?d00001 diff --git a/tests/Feature/FileManager/BrowseTest.php b/tests/Feature/FileManager/BrowseTest.php index d1bafedb..85f62779 100644 --- a/tests/Feature/FileManager/BrowseTest.php +++ b/tests/Feature/FileManager/BrowseTest.php @@ -338,8 +338,8 @@ class BrowseTest extends TestCase 'parent_id' => null, 'name' => 'root', 'user_id' => $user->id, - 'deleted_at' => Carbon::now(), "user_scope" => "master", + 'deleted_at' => Carbon::now(), ]); $file = File::factory(File::class)