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

add translation for preview and sorting, add sorting for moveItem tree and remove for favourites tree

Browse Source
This commit is contained in:
Milos Holba
2020-12-10 18:38:48 +01:00
parent c3d162b991
commit 21a36c0965
9 changed files with 53 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,7 +176,7 @@ class BrowseController extends Controller
$folders = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
->where('parent_id', 0)
->where('user_id', Auth::id())
->orderByDesc('created_at')
->sortable()
->get(['id', 'parent_id', 'unique_id', 'name']);
return [

2
app/Http/Controllers/Sharing/FileSharingController.php
View File

@@ -251,6 +251,7 @@ class FileSharingController extends Controller
$folders = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
->where('parent_id', $shared->item_id)
->where('user_id', $shared->user_id)
->sortable()
->get(['id', 'parent_id', 'unique_id', 'name']);
// Return folder tree
@@ -281,6 +282,7 @@ class FileSharingController extends Controller
$folders = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
->where('parent_id', $shared->item_id)
->where('user_id', $shared->user_id)
->sortable()
->get(['id', 'parent_id', 'unique_id', 'name']);
// Return folder tree

5
app/User.php
View File

@@ -305,10 +305,7 @@ class User extends Authenticatable
*/
public function favourite_folders()
{
$sort = strtolower(request()->input('sort') ? request()->input('sort') : 'created_at' );
$direction = strtolower(request()->input('direction') ? request()->input('direction') : 'desc');
return $this->belongsToMany(FileManagerFolder::class, 'favourite_folder', 'user_id', 'folder_unique_id', 'id', 'unique_id')->with('shared:token,id,item_id,permission,protected,expire_in')->orderBy($sort , $direction);
return $this->belongsToMany(FileManagerFolder::class, 'favourite_folder', 'user_id', 'folder_unique_id', 'id', 'unique_id')->with('shared:token,id,item_id,permission,protected,expire_in');
}
/**