openinfra/openstackid-resources
Code Issues Proposed changes

Fix on missing url on image locations

Browse Source 
now images without urls are not
sent on collections.

Change-Id: I2587787b8ee6facbd505d62e81bcef1a48442dea
This commit is contained in:
Sebastian Marcet 2016-10-17 16:42:27 -03:00
parent 39943bfab1
commit a214fa2d41
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/ModelSerializers/Locations/SummitGeoLocatedLocationSerializer.php
View File

@ -44,16 +44,18 @@ class SummitGeoLocatedLocationSerializer extends SummitAbstractLocationSerialize
$location = $this->object; $location = $this->object;
$maps = array(); $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; $values['maps'] = $maps;
$images = array(); $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; $values['images'] = $images;

2
app/ModelSerializers/Locations/SummitLocationImageSerializer.php
View File

@ -38,7 +38,7 @@ class SummitLocationImageSerializer extends SilverStripeSerializer
*/ */
public function serialize($expand = null, array $fields = array(), array $relations = array(), array $params = array() ) 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()) if($this->object->hasPicture())
{ {

1
app/Models/Foundation/Summit/Locations/SummitGeoLocatedLocation.php
View File

@ -32,7 +32,6 @@ class SummitGeoLocatedLocation extends SummitAbstractLocation
return 'SummitGeoLocatedLocation'; return 'SummitGeoLocatedLocation';
} }
/** /**
* @ORM\Column(name="Address1", type="string") * @ORM\Column(name="Address1", type="string")
*/ */