openinfra/openstackid-resources
Code Issues Proposed changes

Fixed null organization on Affiliation

Browse Source 
Solved issue on affilation serialization
when organization is null.

Change-Id: I2905b44feb11443b6f68375b619036787058825a
This commit is contained in:
Sebastian Marcet 2017-04-29 01:55:54 -03:00
parent 775162af9d
commit 2ae37df303
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/ModelSerializers/AffiliationSerializer.php
View File

@ -41,8 +41,10 @@ final class AffiliationSerializer extends SilverStripeSerializer
switch (trim($relation)) {
case 'organization':
{
unset($values['organization_id']);
$values['organization'] = SerializerRegistry::getInstance()->getSerializer($affiliation->getOrganization())->serialize($expand,[],['none']);
if($affiliation->hasOrganization()) {
unset($values['organization_id']);
$values['organization'] = SerializerRegistry::getInstance()->getSerializer($affiliation->getOrganization())->serialize($expand, [], ['none']);
}
}
break;
}

7
app/Models/Foundation/Main/Affiliation.php
View File

@ -163,4 +163,11 @@ class Affiliation extends SilverstripeBaseModel
}
}
/**
* @return bool
*/
public function hasOrganization(){
return $this->getOrganizationId() > 0;
}
}