openinfra/openstackid-resources
Code Issues Proposed changes

Fix to workaround bug

Browse Source 
https://github.com/doctrine/doctrine2/issues/5941

Change-Id: I809e0860437e46abf15b18f3f96605bb83e6577b
This commit is contained in:
Sebastian Marcet 2017-03-29 15:53:06 -03:00
parent 338615ed86
commit 2832dc3e76
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/ModelSerializers/AbstractMemberSerializer.php
View File

@ -61,7 +61,7 @@ class AbstractMemberSerializer extends SilverStripeSerializer
if(in_array('affiliations', $relations)){
$res = [];
foreach ($member->getAffiliations() as $affiliation){
foreach ($member->getCurrentAffiliations() as $affiliation){
$res[] = SerializerRegistry::getInstance()
->getSerializer($affiliation)
->serialize('organization');

6
app/Models/Foundation/Main/Member.php
View File

@ -54,10 +54,10 @@ class Member extends SilverstripeBaseModel
*/
public function getCurrentAffiliations(){
$criteria = Criteria::create()
->where(Criteria::expr()->eq("isCurrent", true))
->andWhere(Criteria::expr()->eq("endDate", null))
->where(Criteria::expr()->eq("is_current", true))
->andWhere(Criteria::expr()->eq("end_date", null))
->orderBy([
"startDate" => Criteria::ASC,
"start_date" => Criteria::ASC,
]);
return $this->affiliations->matching($criteria);