diff --git a/app/ModelSerializers/AbstractMemberSerializer.php b/app/ModelSerializers/AbstractMemberSerializer.php index 391cf724..07465f6f 100644 --- a/app/ModelSerializers/AbstractMemberSerializer.php +++ b/app/ModelSerializers/AbstractMemberSerializer.php @@ -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'); diff --git a/app/Models/Foundation/Main/Member.php b/app/Models/Foundation/Main/Member.php index 4dcbecf7..0a460c8d 100644 --- a/app/Models/Foundation/Main/Member.php +++ b/app/Models/Foundation/Main/Member.php @@ -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);