nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-28 02:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

team folders page

Browse Source
This commit is contained in:
Peter Papp
2021-08-26 12:20:36 +02:00
parent 7020720392
commit bee7352b28
21 changed files with 620 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Domain/Browsing/Controllers/BrowseFolderController.php
+1
View File
@@ -19,6 +19,7 @@ class BrowseFolderController
// Get folders and files
$folders = Folder::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
->where('parent_id', $root_id)
->where('team_folder', false)
->where('user_id', Auth::id())
->sortable()
->get();
src/Domain/Folders/Controllers/NavigationFolderTreeController.php
+14 -3
View File
@@ -9,17 +9,28 @@ class NavigationFolderTreeController
public function __invoke(): array
{
$folders = Folder::with('folders:id,parent_id,id,name')
->where('parent_id', null)
->where('parent_id')
->where('team_folder', false)
->where('user_id', Auth::id())
->sortable()
->get(['id', 'parent_id', 'id', 'name']);
$teamFolders = Folder::with('folders:id,parent_id,id,name')
->where('parent_id')
->where('team_folder', true)
->where('user_id', Auth::id())
->sortable()
->get(['id', 'parent_id', 'id', 'name']);
return [
[
'name' => __t('home'),
'location' => 'base',
'name' => 'Files',
'folders' => $folders,
],
[
'name' => 'Team Folders',
'folders' => $teamFolders,
],
];
}
}
src/Domain/Teams/Controllers/TeamFoldersController.php
+15 -6
View File
@@ -14,6 +14,7 @@ use Domain\Teams\DTO\CreateTeamFolderData;
use Domain\Teams\Actions\UpdateMembersAction;
use Domain\Teams\Actions\UpdateInvitationsAction;
use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
use Str;
class TeamFoldersController extends Controller
{
@@ -27,19 +28,27 @@ class TeamFoldersController extends Controller
$isHomepage = $id === 'undefined';
$rootId = $id === 'undefined' ? null : $id;
$requestedFolder = $rootId ? Folder::findOrFail($rootId) : null;
$files = [];
$folders = Folder::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
$folders = Folder::with([
'teamMembers',
'teamInvitations',
'parent:id,name',
'shared:token,id,item_id,permission,is_protected,expire_in'
])
->where('parent_id', $rootId)
->where('team_folder', $isHomepage)
->where('user_id', Auth::id())
->sortable()
->get();
$files = File::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
->where('folder_id', $rootId)
->where('user_id', Auth::id())
->sortable()
->get();
if (Str::isUuid($id)) {
$files = File::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
->where('folder_id', $rootId)
->where('user_id', Auth::id())
->sortable()
->get();
}
// Collect folders and files to single array
return [