aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/classes/JsonApi/Schemas/Forum/ForumDiscussion.php4
-rw-r--r--resources/vue/components/forum/discussions/DiscussionIndex.vue2
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'}