X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/60d4c5902b1a3d03ae493fdeabfa09bbf80d844d..refs/pull/3918/head:/app/Uploads/Attachment.php diff --git a/app/Uploads/Attachment.php b/app/Uploads/Attachment.php index 410a7d4dd..6c7066ff9 100644 --- a/app/Uploads/Attachment.php +++ b/app/Uploads/Attachment.php @@ -2,7 +2,7 @@ namespace BookStack\Uploads; -use BookStack\Auth\Permissions\PermissionService; +use BookStack\Auth\Permissions\PermissionApplicator; use BookStack\Auth\User; use BookStack\Entities\Models\Entity; use BookStack\Entities\Models\Page; @@ -12,15 +12,15 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * @property int $id + * @property int $id * @property string $name * @property string $path * @property string $extension - * @property ?Page $page - * @property bool $external - * @property int $uploaded_to - * @property User $updatedBy - * @property User $createdBy + * @property ?Page $page + * @property bool $external + * @property int $uploaded_to + * @property User $updatedBy + * @property User $createdBy * * @method static Entity|Builder visible() */ @@ -89,10 +89,10 @@ class Attachment extends Model */ public function scopeVisible(): Builder { - $permissionService = app()->make(PermissionService::class); - return $permissionService->filterRelatedEntity( - Page::class, - Attachment::query(), + $permissions = app()->make(PermissionApplicator::class); + + return $permissions->restrictPageRelationQuery( + self::query(), 'attachments', 'uploaded_to' );