From bf5b5228189b78cf123ef5e192beab896322fa02 Mon Sep 17 00:00:00 2001 From: Sami Mazouz Date: Fri, 10 May 2024 17:21:51 +0100 Subject: [PATCH] fix --- extensions/tags/src/Api/Resource/TagResource.php | 3 ++- extensions/tags/src/Tag.php | 2 +- framework/core/src/Api/Resource/PostResource.php | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/extensions/tags/src/Api/Resource/TagResource.php b/extensions/tags/src/Api/Resource/TagResource.php index c5616cc24..75ccbbb8c 100644 --- a/extensions/tags/src/Api/Resource/TagResource.php +++ b/extensions/tags/src/Api/Resource/TagResource.php @@ -118,7 +118,8 @@ class TagResource extends AbstractDatabaseResource Schema\Integer::make('discussionCount'), Schema\Integer::make('position') ->nullable(), - Schema\Str::make('defaultSort'), + Schema\Str::make('defaultSort') + ->nullable(), Schema\Boolean::make('isChild') ->get(fn (Tag $tag) => (bool) $tag->parent_id), Schema\DateTime::make('lastPostedAt'), diff --git a/extensions/tags/src/Tag.php b/extensions/tags/src/Tag.php index 0e2a82b32..e647c118b 100644 --- a/extensions/tags/src/Tag.php +++ b/extensions/tags/src/Tag.php @@ -34,7 +34,7 @@ use Illuminate\Database\Query\Builder as QueryBuilder; * @property bool $is_primary * @property int $position * @property int $parent_id - * @property string $default_sort + * @property string|null $default_sort * @property bool $is_restricted * @property bool $is_hidden * @property int $discussion_count diff --git a/framework/core/src/Api/Resource/PostResource.php b/framework/core/src/Api/Resource/PostResource.php index 1b1984c1f..6fc513450 100644 --- a/framework/core/src/Api/Resource/PostResource.php +++ b/framework/core/src/Api/Resource/PostResource.php @@ -245,11 +245,11 @@ class PostResource extends AbstractDatabaseResource ->visible(fn (Post $post) => $post->hidden_at !== null), Schema\Boolean::make('canEdit') - ->visible(fn (Post $post, Context $context) => $context->getActor()->can('edit', $post)), + ->get(fn (Post $post, Context $context) => $context->getActor()->can('edit', $post)), Schema\Boolean::make('canDelete') - ->visible(fn (Post $post, Context $context) => $context->getActor()->can('delete', $post)), + ->get(fn (Post $post, Context $context) => $context->getActor()->can('delete', $post)), Schema\Boolean::make('canHide') - ->visible(fn (Post $post, Context $context) => $context->getActor()->can('hide', $post)), + ->get(fn (Post $post, Context $context) => $context->getActor()->can('hide', $post)), Schema\Relationship\ToOne::make('user') ->includable(),