openinfra/openstackid-resources
Code Issues Proposed changes

Updated serialization expand for team members

Browse Source 
* added groups expand

Change-Id: I177ce59dc8969b7be0e538bf51eb4abec6526609
This commit is contained in:
Sebastian Marcet 2017-01-25 12:09:41 -03:00
parent 744cd93eb8
commit 92549579b8
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/ModelSerializers/ChatTeams/ChatTeamMemberSerializer.php
View File

@ -42,14 +42,14 @@ final class ChatTeamMemberSerializer extends SilverStripeSerializer
$values = parent::serialize($expand, $fields, $relations, $params); $values = parent::serialize($expand, $fields, $relations, $params);
if (!empty($expand)) { if (!empty($expand)) {
$expand = explode(',', $expand); $expand_to = explode(',', $expand);
foreach ($expand as $relation) { foreach ($expand_to as $relation) {
switch (trim($relation)) { switch (trim($relation)) {
case 'member':{ case 'member':{
if(isset($values['member_id'])) if(isset($values['member_id']))
{ {
unset($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; break;

6
app/ModelSerializers/ChatTeams/ChatTeamSerializer.php
View File

@ -58,14 +58,14 @@ final class ChatTeamSerializer extends SilverStripeSerializer
$values['members'] = $members; $values['members'] = $members;
if (!empty($expand)) { if (!empty($expand)) {
$expand = explode(',', $expand); $expand_to = explode(',', $expand);
foreach ($expand as $relation) { foreach ($expand_to as $relation) {
switch (trim($relation)) { switch (trim($relation)) {
case 'owner':{ case 'owner':{
if(isset($values['owner_id'])) if(isset($values['owner_id']))
{ {
unset($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; break;

9
app/ModelSerializers/SummitAttendeeSerializer.php
View File

@ -118,15 +118,6 @@ final class SummitAttendeeSerializer extends SilverStripeSerializer
} }
} }
break; 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;
} }
} }
} }