X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ddb7f33868ea499ab8f48a7062f145e8c0fbe02f..refs/pull/3012/head:/app/Entities/Repos/BaseRepo.php diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php index 78ce505b9..569918503 100644 --- a/app/Entities/Repos/BaseRepo.php +++ b/app/Entities/Repos/BaseRepo.php @@ -3,25 +3,17 @@ namespace BookStack\Entities\Repos; use BookStack\Actions\TagRepo; -use BookStack\Entities\Book; -use BookStack\Entities\Entity; -use BookStack\Entities\HasCoverImage; +use BookStack\Entities\Models\Entity; +use BookStack\Entities\Models\HasCoverImage; use BookStack\Exceptions\ImageUploadException; use BookStack\Uploads\ImageRepo; use Illuminate\Http\UploadedFile; -use Illuminate\Support\Collection; class BaseRepo { - protected $tagRepo; protected $imageRepo; - - /** - * BaseRepo constructor. - * @param $tagRepo - */ public function __construct(TagRepo $tagRepo, ImageRepo $imageRepo) { $this->tagRepo = $tagRepo; @@ -29,7 +21,7 @@ class BaseRepo } /** - * Create a new entity in the system + * Create a new entity in the system. */ public function create(Entity $entity, array $input) { @@ -37,6 +29,7 @@ class BaseRepo $entity->forceFill([ 'created_by' => user()->id, 'updated_by' => user()->id, + 'owned_by' => user()->id, ]); $entity->refreshSlug(); $entity->save(); @@ -73,15 +66,17 @@ class BaseRepo /** * Update the given items' cover image, or clear it. + * * @throws ImageUploadException * @throws \Exception */ - public function updateCoverImage(HasCoverImage $entity, UploadedFile $coverImage = null, bool $removeImage = false) + public function updateCoverImage(HasCoverImage $entity, ?UploadedFile $coverImage, bool $removeImage = false) { if ($coverImage) { $this->imageRepo->destroyImage($entity->cover); $image = $this->imageRepo->saveNew($coverImage, 'cover_book', $entity->id, 512, 512, true); $entity->cover()->associate($image); + $entity->save(); } if ($removeImage) { @@ -90,29 +85,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(); - } }