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

added it_get_shared_items test

Browse Source
This commit is contained in:
Peter Papp
2021-03-01 17:39:24 +01:00
parent 1784ff84c8
commit bcba0fd057
4 changed files with 82 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/FileBrowser/BrowseController.php
View File

@@ -43,7 +43,7 @@ class BrowseController extends Controller
->with(['parent'])
->where('user_id', $user_id)
->whereNull('folder_id')
->whereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'unique_id'))))
->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))))
->sortable()
->get();
@@ -73,13 +73,13 @@ class BrowseController extends Controller
// Get folders and files
$folders = Folder::with(['parent', 'shared:token,id,item_id,permission,is_protected,expire_in'])
->where('user_id', $user_id)
->whereIn('unique_id', $folder_ids)
->whereIn('id', $folder_ids)
->sortable()
->get();
$files = File::with(['parent', 'shared:token,id,item_id,permission,is_protected,expire_in'])
->where('user_id', $user_id)
->whereIn('unique_id', $file_ids)
->whereIn('id', $file_ids)
->sortable()
->get();