diff options
| author | Murtaza Sultani <sultani@data-quest.de> | 2025-07-15 10:24:27 +0200 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-07-15 10:24:27 +0200 |
| commit | 7801dd9d96c8e8e898af08ea3a760b06bee01d6b (patch) | |
| tree | b405237728d3e3bfbdacf8db7ece1b969eaab24a | |
| parent | ef3dacbdf6927b1b32fc556f05d796e990bfa414 (diff) | |
Resolve "JSON:API behandelt gelöschte Benutzer im Discussion-Schema"
Closes #5726
Merge request studip/studip!4357
| -rw-r--r-- | lib/classes/JsonApi/Schemas/Forum/ForumDiscussion.php | 4 | ||||
| -rw-r--r-- | 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'} |