diff --git a/app/ModelSerializers/ChatTeams/ChatTeamMemberSerializer.php b/app/ModelSerializers/ChatTeams/ChatTeamMemberSerializer.php index f56ea6c7..920ebb27 100644 --- a/app/ModelSerializers/ChatTeams/ChatTeamMemberSerializer.php +++ b/app/ModelSerializers/ChatTeams/ChatTeamMemberSerializer.php @@ -42,14 +42,14 @@ final class ChatTeamMemberSerializer extends SilverStripeSerializer $values = parent::serialize($expand, $fields, $relations, $params); if (!empty($expand)) { - $expand = explode(',', $expand); - foreach ($expand as $relation) { + $expand_to = explode(',', $expand); + foreach ($expand_to as $relation) { switch (trim($relation)) { case 'member':{ if(isset($values['member_id'])) { unset($values['member_id']); - $values['member'] = SerializerRegistry::getInstance()->getSerializer($team_member->getMember())->serialize(); + $values['member'] = SerializerRegistry::getInstance()->getSerializer($team_member->getMember())->serialize($expand); } } break; diff --git a/app/ModelSerializers/ChatTeams/ChatTeamSerializer.php b/app/ModelSerializers/ChatTeams/ChatTeamSerializer.php index 9b0ba348..cf9dbc98 100644 --- a/app/ModelSerializers/ChatTeams/ChatTeamSerializer.php +++ b/app/ModelSerializers/ChatTeams/ChatTeamSerializer.php @@ -58,14 +58,14 @@ final class ChatTeamSerializer extends SilverStripeSerializer $values['members'] = $members; if (!empty($expand)) { - $expand = explode(',', $expand); - foreach ($expand as $relation) { + $expand_to = explode(',', $expand); + foreach ($expand_to as $relation) { switch (trim($relation)) { case 'owner':{ if(isset($values['owner_id'])) { unset($values['owner_id']); - $values['owner'] = SerializerRegistry::getInstance()->getSerializer($team->getOwner())->serialize(); + $values['owner'] = SerializerRegistry::getInstance()->getSerializer($team->getOwner())->serialize($expand); } } break; diff --git a/app/ModelSerializers/SummitAttendeeSerializer.php b/app/ModelSerializers/SummitAttendeeSerializer.php index 026a804a..ba076fdd 100644 --- a/app/ModelSerializers/SummitAttendeeSerializer.php +++ b/app/ModelSerializers/SummitAttendeeSerializer.php @@ -118,15 +118,6 @@ final class SummitAttendeeSerializer extends SilverStripeSerializer } } break; - case 'feedback': { - $feedback = array(); - foreach ($attendee->getEmittedFeedback() as $f) { - if(!$summit->isEventOnSchedule($f->getEvent()->getId())) continue; - array_push($feedback, SerializerRegistry::getInstance()->getSerializer($f)->serialize()); - } - $values['feedback'] = $feedback; - } - break; } } }