From 6abf5a30ac7996eefcb35a0fe964aac7130b8d00 Mon Sep 17 00:00:00 2001 From: Sebastian Marcet Date: Wed, 18 Jul 2018 11:42:15 -0300 Subject: [PATCH] Fixed SS base model serialization Added checks for null values for creation and edited dates Change-Id: Ifad88865502f11a6589d61f931fa4e55d3d0821b --- app/Models/Utils/SilverstripeBaseModel.php | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/app/Models/Utils/SilverstripeBaseModel.php b/app/Models/Utils/SilverstripeBaseModel.php index a98de814..daef7393 100644 --- a/app/Models/Utils/SilverstripeBaseModel.php +++ b/app/Models/Utils/SilverstripeBaseModel.php @@ -26,6 +26,18 @@ class SilverstripeBaseModel extends BaseEntity { const DefaultTimeZone = 'America/Chicago'; + /** + * @var \DateTime + * @ORM\Column(name="Created", type="datetime") + */ + protected $created; + + /** + * @var \DateTime + * @ORM\Column(name="LastEdited", type="datetime") + */ + protected $last_edited; + /** * @return \DateTime */ @@ -38,6 +50,7 @@ class SilverstripeBaseModel extends BaseEntity * @return \DateTime|null */ public function getCreatedUTC(){ + if(is_null($this->created)) return null; return $this->getDateFromLocalToUTC($this->created); } @@ -61,6 +74,7 @@ class SilverstripeBaseModel extends BaseEntity * @return \DateTime|null */ public function getLastEditedUTC(){ + if(is_null($this->last_edited)) return null; return $this->getDateFromLocalToUTC($this->last_edited); } @@ -85,15 +99,6 @@ class SilverstripeBaseModel extends BaseEntity $this->last_edited = $last_edited; } - /** - * @ORM\Column(name="Created", type="datetime") - */ - protected $created; - - /** - * @ORM\Column(name="LastEdited", type="datetime") - */ - protected $last_edited; public function __construct() {