From 79889edd293fb3e74ded0534db60ef599f5b232d Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 20 May 2015 08:18:48 +0100 Subject: [PATCH] Fix editing of incident.created_at under Postgres --- app/Http/Controllers/Admin/IncidentController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/IncidentController.php b/app/Http/Controllers/Admin/IncidentController.php index 2e5c0b17..c10aab85 100644 --- a/app/Http/Controllers/Admin/IncidentController.php +++ b/app/Http/Controllers/Admin/IncidentController.php @@ -118,10 +118,12 @@ class IncidentController extends AbstractController $incidentData['user_id'] = Auth::user()->id; $componentStatus = array_pull($incidentData, 'component_status'); - if (array_has($incidentData, 'created_at')) { + if (array_has($incidentData, 'created_at') && $incidentData['created_at']) { $incidentDate = Date::createFromFormat('d/m/Y H:i', $incidentData['created_at'], Setting::get('app_timezone'))->setTimezone(Config::get('app.timezone')); $incidentData['created_at'] = $incidentDate; $incidentData['updated_at'] = $incidentDate; + } else { + unset($incidentData['created_at']); } $incident = Incident::create($incidentData); @@ -296,10 +298,12 @@ class IncidentController extends AbstractController $incidentData = Binput::get('incident'); $incidentData['user_id'] = Auth::user()->id; - if (array_has($incidentData, 'created_at')) { + if (array_has($incidentData, 'created_at') && $incidentData['created_at']) { $incidentDate = Date::createFromFormat('d/m/Y H:i', $incidentData['created_at'], Setting::get('app_timezone'))->setTimezone(Config::get('app.timezone')); $incidentData['created_at'] = $incidentDate; $incidentData['updated_at'] = $incidentDate; + } else { + unset($incidentData['created_at']); } $incident->update($incidentData);