DesktopToolbar.vue team members widget resolving

This commit is contained in:
Čarodej
2021-10-22 10:53:04 +02:00
parent cea881ce38
commit 705281325f
8 changed files with 87 additions and 40 deletions
@@ -21,7 +21,7 @@ class DeleteUserDataAction
Storage::deleteDirectory("files/$user->id");
// Delete all user records in database
collect(['folders', 'files', 'user_settings', 'shares', 'favourite_folder', 'zips', 'traffic'])
collect(['folders', 'files', 'user_settings', 'shares', 'favourite_folder', 'traffic'])
->each(function ($table) use ($user) {
DB::table($table)
->whereUserId($user->id)
@@ -28,14 +28,13 @@ class ShareController extends Controller
CreateShareRequest $request,
SendViaEmailAction $sendLinkToEmailAction,
): ShareResource {
$type = $request->input('type') === 'folder' ? 'folder' : 'file';
$item = get_item($request->input('id'), $type);
$item = get_item($request->input('type'), $request->input('id'));
$this->authorize('owner', $item);
$shared = Share::create([
'password' => $request->has('password') ? bcrypt($request->input('password')) : null,
'type' => $type,
'type' => $request->input('type') === 'folder' ? 'folder' : 'file',
'is_protected' => $request->input('isPassword'),
'permission' => $request->input('permission') ?? null,
'expire_in' => $request->input('expiration') ?? null,
@@ -33,13 +33,11 @@ class TeamFoldersController extends Controller
$folders = Folder::where('parent_id', $id)
->where('team_folder', ! Str::isUuid($id))
->where('user_id', Auth::id())
->sortable()
->get();
if ($id) {
$files = File::where('parent_id', $id)
->where('user_id', Auth::id())
->sortable()
->get();
}