X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/3f7180fa99cbca96f83fcc8d95b3be08adfbb65f..refs/pull/2522/head:/app/Entities/Repos/BaseRepo.php diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php index a9d599eb2..8b2e70074 100644 --- a/app/Entities/Repos/BaseRepo.php +++ b/app/Entities/Repos/BaseRepo.php @@ -4,8 +4,9 @@ namespace BookStack\Entities\Repos; use BookStack\Actions\ActivityType; use BookStack\Actions\TagRepo; -use BookStack\Entities\Entity; -use BookStack\Entities\HasCoverImage; +use BookStack\Auth\User; +use BookStack\Entities\Models\Entity; +use BookStack\Entities\Models\HasCoverImage; use BookStack\Exceptions\ImageUploadException; use BookStack\Facades\Activity; use BookStack\Uploads\ImageRepo; @@ -34,6 +35,7 @@ class BaseRepo $entity->forceFill([ 'created_by' => user()->id, 'updated_by' => user()->id, + 'owned_by' => user()->id, ]); $entity->refreshSlug(); $entity->save(); @@ -88,30 +90,4 @@ class BaseRepo $entity->save(); } } - - /** - * Update the permissions of an entity. - */ - public function updatePermissions(Entity $entity, bool $restricted, Collection $permissions = null) - { - $entity->restricted = $restricted; - $entity->permissions()->delete(); - - if (!is_null($permissions)) { - $entityPermissionData = $permissions->flatMap(function ($restrictions, $roleId) { - return collect($restrictions)->keys()->map(function ($action) use ($roleId) { - return [ - 'role_id' => $roleId, - 'action' => strtolower($action), - ] ; - }); - }); - - $entity->permissions()->createMany($entityPermissionData); - } - - $entity->save(); - $entity->rebuildPermissions(); - Activity::addForEntity($entity, ActivityType::PERMISSIONS_UPDATE); - } }