X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/32f6ea946f00d25b3e70166d4e1bd3ef27d64a33..refs/pull/3012/head:/app/Uploads/Attachment.php diff --git a/app/Uploads/Attachment.php b/app/Uploads/Attachment.php index dfd7d980a..5e637246a 100644 --- a/app/Uploads/Attachment.php +++ b/app/Uploads/Attachment.php @@ -3,6 +3,7 @@ namespace BookStack\Uploads; use BookStack\Auth\Permissions\PermissionService; +use BookStack\Auth\User; use BookStack\Entities\Models\Entity; use BookStack\Entities\Models\Page; use BookStack\Model; @@ -11,13 +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 ?Page $page + * @property bool $external + * @property int $uploaded_to + * @property User $updatedBy + * @property User $createdBy * * @method static Entity|Builder visible() */ @@ -26,6 +29,10 @@ class Attachment extends Model use HasCreatorAndUpdater; protected $fillable = ['name', 'order']; + protected $hidden = ['path', 'page']; + protected $casts = [ + 'external' => 'bool', + ]; /** * Get the downloadable file name for this upload. @@ -80,12 +87,13 @@ class Attachment extends Model /** * Scope the query to those attachments that are visible based upon related page permissions. */ - public function scopeVisible(): string + public function scopeVisible(): Builder { $permissionService = app()->make(PermissionService::class); + return $permissionService->filterRelatedEntity( Page::class, - Attachment::query(), + self::query(), 'attachments', 'uploaded_to' );