show owner in team members information

This commit is contained in:
Čarodej
2021-10-25 08:06:51 +02:00
parent c9631a9727
commit 69fccfeaad
6 changed files with 55 additions and 11 deletions
@@ -832,6 +832,13 @@ class SetupDevEnvironment extends Command
'permission' => 'can-edit',
]);
DB::table('team_folder_members')
->insert([
'parent_id' => $folder->id,
'user_id' => $owner->id,
'permission' => 'owner',
]);
// Get meme gallery
collect([
'Sofishticated.jpg',
@@ -863,17 +870,17 @@ class SetupDevEnvironment extends Command
'Eggcited bro.jpg',
'Get a Rest.jpg',
])
->each(function ($file) use ($owner, $hug) {
->each(function ($file) use ($member, $hug) {
$basename = Str::random(12) . '-' . $file;
// Copy file into app storage
Storage::putFileAs("files/$owner->id", storage_path("demo/images/memes/$file"), $basename, 'private');
Storage::putFileAs("files/$owner->id", storage_path("demo/images/memes/thumbnail-$file"), "thumbnail-$basename", 'private');
Storage::putFileAs("files/$member->id", storage_path("demo/images/memes/$file"), $basename, 'private');
Storage::putFileAs("files/$member->id", storage_path("demo/images/memes/thumbnail-$file"), "thumbnail-$basename", 'private');
// Create file record
File::create([
'parent_id' => $hug->id,
'user_id' => $owner->id,
'user_id' => $member->id,
'name' => $file,
'basename' => $basename,
'type' => 'image',
@@ -32,6 +32,7 @@ class BrowseSharedWithMeController
if (!$id) {
$sharedFolderIds = DB::table('team_folder_members')
->where('user_id', Auth::id())
->whereIn('permission', ['can-edit', 'can-view'])
->pluck('parent_id');
$folders = Folder::whereIn('id', $sharedFolderIds)
@@ -1,12 +1,14 @@
<?php
namespace Domain\Teams\Controllers;
use Auth;
use Illuminate\Http\Response;
use Domain\Folders\Models\Folder;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\Routing\ResponseFactory;
use Domain\Teams\Requests\ConvertIntoTeamFolderRequest;
use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
use Illuminate\Support\Facades\DB;
class ConvertFolderIntoTeamFolderController extends Controller
{
@@ -24,6 +26,14 @@ class ConvertFolderIntoTeamFolderController extends Controller
'parent_id' => null,
]);
// Attach owner into members
DB::table('team_folder_members')
->insert([
'parent_id' => $folder->id,
'user_id' => $folder->user_id,
'permission' => 'owner',
]);
// Invite team members
($this->inviteMembers)($request->input('invitations'), $folder);
@@ -63,6 +63,14 @@ class TeamFoldersController extends Controller
'team_folder' => 1,
]);
// Attach owner into members
DB::table('team_folder_members')
->insert([
'parent_id' => $folder->id,
'user_id' => $request->user()->id,
'permission' => 'owner',
]);
// Invite team members
$this->inviteMembers->onQueue()->execute($data->invitations, $folder);