diff --git a/app/ModelSerializers/Locations/SummitGeoLocatedLocationSerializer.php b/app/ModelSerializers/Locations/SummitGeoLocatedLocationSerializer.php index abaed3c5..64d600ad 100644 --- a/app/ModelSerializers/Locations/SummitGeoLocatedLocationSerializer.php +++ b/app/ModelSerializers/Locations/SummitGeoLocatedLocationSerializer.php @@ -44,16 +44,18 @@ class SummitGeoLocatedLocationSerializer extends SummitAbstractLocationSerialize $location = $this->object; $maps = array(); - foreach($location->getMaps() as $m) + foreach($location->getMaps() as $image) { - $maps[] = SerializerRegistry::getInstance()->getSerializer($m)->serialize(); + if(!$image->hasPicture()) continue; + $maps[] = SerializerRegistry::getInstance()->getSerializer($image)->serialize(); } $values['maps'] = $maps; $images = array(); - foreach($location->getImages() as $i) + foreach($location->getImages() as $image) { - $images[] = SerializerRegistry::getInstance()->getSerializer($i)->serialize(); + if(!$image->hasPicture()) continue; + $images[] = SerializerRegistry::getInstance()->getSerializer($image)->serialize(); } $values['images'] = $images; diff --git a/app/ModelSerializers/Locations/SummitLocationImageSerializer.php b/app/ModelSerializers/Locations/SummitLocationImageSerializer.php index 870c6838..3b7559cd 100644 --- a/app/ModelSerializers/Locations/SummitLocationImageSerializer.php +++ b/app/ModelSerializers/Locations/SummitLocationImageSerializer.php @@ -38,7 +38,7 @@ class SummitLocationImageSerializer extends SilverStripeSerializer */ public function serialize($expand = null, array $fields = array(), array $relations = array(), array $params = array() ) { - $values = parent::serialize($expand, $fields, $relations, $params); + $values = parent::serialize($expand, $fields, $relations, $params); if($this->object->hasPicture()) { diff --git a/app/Models/Foundation/Summit/Locations/SummitGeoLocatedLocation.php b/app/Models/Foundation/Summit/Locations/SummitGeoLocatedLocation.php index b1c7dbae..e3acedc0 100644 --- a/app/Models/Foundation/Summit/Locations/SummitGeoLocatedLocation.php +++ b/app/Models/Foundation/Summit/Locations/SummitGeoLocatedLocation.php @@ -32,7 +32,6 @@ class SummitGeoLocatedLocation extends SummitAbstractLocation return 'SummitGeoLocatedLocation'; } - /** * @ORM\Column(name="Address1", type="string") */