From adc32cbb992a8bccc657ec44df42fd66d312a52e Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Fri, 21 Oct 2022 07:13:42 +0000
Subject: [PATCH] fix #1687
Closes #1687
Merge request studip/studip!1102
---
lib/classes/JsonApi/Schemas/Courseware/Block.php | 10 ++++++----
lib/classes/JsonApi/Schemas/Courseware/Container.php | 6 +++---
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/lib/classes/JsonApi/Schemas/Courseware/Block.php b/lib/classes/JsonApi/Schemas/Courseware/Block.php
index 63fd96e47c6..b83e4b83cbe 100755
--- a/lib/classes/JsonApi/Schemas/Courseware/Block.php
+++ b/lib/classes/JsonApi/Schemas/Courseware/Block.php
@@ -67,14 +67,16 @@ class Block extends SchemaProvider
self::RELATIONSHIP_DATA => $resource->container,
];
- $relationships[self::REL_OWNER] = [
+ $relationships[self::REL_OWNER] = $resource->owner
+ ? [
self::RELATIONSHIP_LINKS => [
Link::RELATED => $this->createLinkToResource($resource->owner),
],
self::RELATIONSHIP_DATA => $resource->owner,
- ];
+ ]
+ : [self::RELATIONSHIP_DATA => null];
- $relationships[self::REL_EDITOR] = $resource['editor_id']
+ $relationships[self::REL_EDITOR] = $resource->editor
? [
self::RELATIONSHIP_LINKS => [
Link::RELATED => $this->createLinkToResource($resource->editor),
@@ -84,7 +86,7 @@ class Block extends SchemaProvider
: [self::RELATIONSHIP_DATA => null];
- $relationships[self::REL_EDITBLOCKER] = $resource['edit_blocker_id']
+ $relationships[self::REL_EDITBLOCKER] = $resource->edit_blocker
? [
self::RELATIONSHIP_LINKS_SELF => true,
self::RELATIONSHIP_LINKS => [
diff --git a/lib/classes/JsonApi/Schemas/Courseware/Container.php b/lib/classes/JsonApi/Schemas/Courseware/Container.php
index 7842de2c7b3..fd33c5c2df0 100755
--- a/lib/classes/JsonApi/Schemas/Courseware/Container.php
+++ b/lib/classes/JsonApi/Schemas/Courseware/Container.php
@@ -50,7 +50,7 @@ class Container extends SchemaProvider
$relationships = [];
$relationships = $this->addBlocksRelationship($relationships, $resource, $this->shouldInclude($context, self::REL_BLOCKS));
- $relationships[self::REL_OWNER] = $resource['owner_id']
+ $relationships[self::REL_OWNER] = $resource->owner
? [
self::RELATIONSHIP_LINKS => [
Link::RELATED => $this->createLinkToResource($resource->owner),
@@ -59,7 +59,7 @@ class Container extends SchemaProvider
]
: [self::RELATIONSHIP_DATA => $resource->owner];
- $relationships[self::REL_EDITOR] = $resource['editor_id']
+ $relationships[self::REL_EDITOR] = $resource->editor
? [
self::RELATIONSHIP_LINKS => [
Link::RELATED => $this->createLinkToResource($resource->editor),
@@ -68,7 +68,7 @@ class Container extends SchemaProvider
]
: [self::RELATIONSHIP_DATA => null];
- $relationships[self::REL_EDITBLOCKER] = $resource['edit_blocker_id']
+ $relationships[self::REL_EDITBLOCKER] = $resource->edit_blocker
? [
self::RELATIONSHIP_LINKS_SELF => true,
self::RELATIONSHIP_LINKS => [
--
GitLab