From 7801dd9d96c8e8e898af08ea3a760b06bee01d6b Mon Sep 17 00:00:00 2001 From: Murtaza Sultani Date: Tue, 15 Jul 2025 10:24:27 +0200 Subject: =?UTF-8?q?Resolve=20"JSON:API=20behandelt=20gel=C3=B6schte=20Benu?= =?UTF-8?q?tzer=20im=20Discussion-Schema"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #5726 Merge request studip/studip!4357 --- lib/classes/JsonApi/Schemas/Forum/ForumDiscussion.php | 4 ++-- resources/vue/components/forum/discussions/DiscussionIndex.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/classes/JsonApi/Schemas/Forum/ForumDiscussion.php b/lib/classes/JsonApi/Schemas/Forum/ForumDiscussion.php index ebd3fee..6c5309e 100644 --- a/lib/classes/JsonApi/Schemas/Forum/ForumDiscussion.php +++ b/lib/classes/JsonApi/Schemas/Forum/ForumDiscussion.php @@ -111,8 +111,8 @@ class ForumDiscussion extends SchemaProvider private function addUserRelationship(array $relationships, $discussion, bool $withUser = false) { - if ($withUser) { - $user = $discussion->user; + $user = $discussion->user; + if ($withUser && $user) { $relationships[self::REL_USER] = [ self::RELATIONSHIP_LINKS => [ Link::RELATED => $this->createLinkToResource($user) diff --git a/resources/vue/components/forum/discussions/DiscussionIndex.vue b/resources/vue/components/forum/discussions/DiscussionIndex.vue index e9665e3..86fdf8a 100644 --- a/resources/vue/components/forum/discussions/DiscussionIndex.vue +++ b/resources/vue/components/forum/discussions/DiscussionIndex.vue @@ -43,7 +43,7 @@ const { } = useSortable(discussionsRef); const getActionMenusItems = discussion => { - if (forumConfig.isModerator || discussion.user.id === STUDIP.USER_ID) { + if (forumConfig.isModerator || discussion.user?.id === STUDIP.USER_ID) { return [ { label: $gettext('Bearbeiten'), icon: 'edit', emit: 'edit'}, { label: $gettext('Löschen'), icon: 'trash', emit: 'delete'} -- cgit v1.0