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

trash fixed

Browse Source
This commit is contained in:
Peter Papp
2021-03-16 10:30:36 +01:00
parent f3783e6f98
commit adbe35e8b5
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/SetupDevEnvironment.php
+4 -2
View File
@@ -184,6 +184,7 @@ class SetupDevEnvironment extends Command
->create([ ->create([
'type' => 'folder', 'type' => 'folder',
'item_id' => $shared_folder->id, 'item_id' => $shared_folder->id,
'user_id' => $user->id,
'permission' => 'editor', 'permission' => 'editor',
'is_protected' => false, 'is_protected' => false,
'password' => null, 'password' => null,
@@ -318,6 +319,7 @@ class SetupDevEnvironment extends Command
->create([ ->create([
'type' => 'folder', 'type' => 'folder',
'item_id' => $documents->id, 'item_id' => $documents->id,
'user_id' => $user->id,
'permission' => 'editor', 'permission' => 'editor',
'is_protected' => false, 'is_protected' => false,
'password' => null, 'password' => null,
@@ -722,7 +724,7 @@ class SetupDevEnvironment extends Command
], ],
[ [
'name' => 'app_favicon', 'name' => 'app_favicon',
'value' => null, 'value' => 'system/favicon.png',
], ],
[ [
'name' => 'google_analytics', 'name' => 'google_analytics',
@@ -764,7 +766,7 @@ class SetupDevEnvironment extends Command
}); });
// Get system images // Get system images
collect(['logo.svg', 'logo-horizontal.svg']) collect(['logo.svg', 'logo-horizontal.svg', 'favicon.png'])
->each(function ($file) { ->each(function ($file) {
\File::copy(storage_path("demo/app/$file"), storage_path("app/system/$file")); \File::copy(storage_path("demo/app/$file"), storage_path("app/system/$file"));
}); });
app/Http/Controllers/FileManager/BrowseController.php
+4 -2
View File
@@ -105,8 +105,10 @@ class BrowseController extends Controller
$files_trashed = File::onlyTrashed() $files_trashed = File::onlyTrashed()
->with(['parent']) ->with(['parent'])
->where('user_id', $user_id) ->where('user_id', $user_id)
->whereNull('folder_id') ->where(function($query) use ($folders_trashed) {
->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id')))) $query->whereNull('folder_id');
$query->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))));
})
->sortable() ->sortable()
->get(); ->get();
storage/demo/app/favicon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

tests/Feature/FileManager/BrowseTest.php
+1 -1
View File
@@ -338,8 +338,8 @@ class BrowseTest extends TestCase
'parent_id' => null, 'parent_id' => null,
'name' => 'root', 'name' => 'root',
'user_id' => $user->id, 'user_id' => $user->id,
'deleted_at' => Carbon::now(),
"user_scope" => "master", "user_scope" => "master",
'deleted_at' => Carbon::now(),
]); ]);
$file = File::factory(File::class) $file = File::factory(File::class)