From 2ae37df303286790810e558265d1982c42cb5fc9 Mon Sep 17 00:00:00 2001
From: Sebastian Marcet <smarcet@gmail.com>
Date: Sat, 29 Apr 2017 01:55:54 -0300
Subject: [PATCH] Fixed null organization on Affiliation

Solved issue on affilation serialization
when organization is null.

Change-Id: I2905b44feb11443b6f68375b619036787058825a
---
 app/ModelSerializers/AffiliationSerializer.php | 6 ++++--
 app/Models/Foundation/Main/Affiliation.php     | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/ModelSerializers/AffiliationSerializer.php b/app/ModelSerializers/AffiliationSerializer.php
index ff888e76..cacfc9ca 100644
--- a/app/ModelSerializers/AffiliationSerializer.php
+++ b/app/ModelSerializers/AffiliationSerializer.php
@@ -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;
                 }
diff --git a/app/Models/Foundation/Main/Affiliation.php b/app/Models/Foundation/Main/Affiliation.php
index 951b6951..9a21ea12 100644
--- a/app/Models/Foundation/Main/Affiliation.php
+++ b/app/Models/Foundation/Main/Affiliation.php
@@ -163,4 +163,11 @@ class Affiliation extends SilverstripeBaseModel
         }
     }
 
+    /**
+     * @return bool
+     */
+    public function hasOrganization(){
+        return $this->getOrganizationId() > 0;
+    }
+
 }
\ No newline at end of file