From 209cd1ec68081a787a7807fccdc5a06235a36007 Mon Sep 17 00:00:00 2001 From: Simon Van Accoleyen Date: Sat, 26 Feb 2022 14:52:42 +0100 Subject: [PATCH 1/2] fix: Allow empty completed_at task date --- app/Http/Controllers/Contacts/TasksController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Contacts/TasksController.php b/app/Http/Controllers/Contacts/TasksController.php index 3da02f08f22..90b73fe1f96 100644 --- a/app/Http/Controllers/Contacts/TasksController.php +++ b/app/Http/Controllers/Contacts/TasksController.php @@ -21,7 +21,7 @@ public function index(Contact $contact) 'title' => $task->title, 'description' => $task->description, 'completed' => $task->completed, - 'completed_at' => DateHelper::getShortDate($task->completed_at), + 'completed_at' => ($task->completed_at) ? DateHelper::getShortDate($task->completed_at): null, 'edit' => false, ]; $tasks->push($data); From 1f526d2293b534fc5a37d73cf9e6bb4f322ed9bb Mon Sep 17 00:00:00 2001 From: Simon Van Accoleyen Date: Sat, 26 Feb 2022 14:57:39 +0100 Subject: [PATCH 2/2] fix styling --- app/Http/Controllers/Contacts/TasksController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Contacts/TasksController.php b/app/Http/Controllers/Contacts/TasksController.php index 90b73fe1f96..d75bc52e62c 100644 --- a/app/Http/Controllers/Contacts/TasksController.php +++ b/app/Http/Controllers/Contacts/TasksController.php @@ -21,7 +21,7 @@ public function index(Contact $contact) 'title' => $task->title, 'description' => $task->description, 'completed' => $task->completed, - 'completed_at' => ($task->completed_at) ? DateHelper::getShortDate($task->completed_at): null, + 'completed_at' => ($task->completed_at) ? DateHelper::getShortDate($task->completed_at) : null, 'edit' => false, ]; $tasks->push($data);