From 4c0319296ca9052016d6e9814c6917c0ea9c2ac5 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 15 Sep 2021 13:58:52 +0800
Subject: [PATCH]  * Fix bug #15183.

---
 module/task/control.php        | 4 ++--
 module/task/model.php          | 5 ++---
 module/task/view/edit.html.php | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 51ec0bc928..4ab35b56bd 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -385,9 +385,9 @@ class task extends control
             $task = $this->task->getById($taskID);
             if($this->post->comment != '' or !empty($changes) or !empty($files))
             {
-                $action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented';
+                $action     = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented';
                 $fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : '';
-                $actionID = $this->action->create('task', $taskID, $action, $fileAction . $this->post->comment);
+                $actionID   = $this->action->create('task', $taskID, $action, $fileAction . $this->post->comment);
                 if(!empty($changes)) $this->action->logHistory($actionID, $changes);
             }
 
diff --git a/module/task/model.php b/module/task/model.php
index 9e87c22359..d59db80472 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -848,8 +848,7 @@ class taskModel extends model
         $now  = helper::now();
         $task = fixer::input('post')
             ->setDefault('story, estimate, left, consumed', 0)
-            ->setDefault('estStarted', '0000-00-00')
-            ->setDefault('deadline', '0000-00-00')
+            ->setDefault('realStarted', '0000-00-00 00:00:00')
             ->setIF(is_numeric($this->post->estimate), 'estimate', (float)$this->post->estimate)
             ->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed)
             ->setIF(is_numeric($this->post->left),     'left',     (float)$this->post->left)
@@ -1922,7 +1921,7 @@ class taskModel extends model
         if($task->assignedTo == 'closed') $task->assignedToRealName = 'Closed';
         foreach($task as $key => $value)
         {
-            if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $task->$key = '';
+            if((strpos($key, 'Date') !== false or strpos('estStarted|deadline', $key) !== false) and !(int)substr($value, 0, 4)) $task->$key = '';
         }
         $task->files = $this->loadModel('file')->getByObject('task', $taskID);
 
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 2f281bc080..5c3862a9c4 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -176,11 +176,11 @@
             <table class='table table-form'>
               <tr>
                 <th class='thWidth'><?php echo $lang->task->estStarted;?></th>
-                <td><?php echo html::input('estStarted', helper::isZeroDate($task->estStarted) ? '' : $task->estStarted, "class='form-control form-date'");?></td>
+                <td><?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date'");?></td>
               </tr>
               <tr>
                 <th><?php echo $lang->task->deadline;?></th>
-                <td><?php echo html::input('deadline', helper::isZeroDate($task->deadline) ? '' : $task->deadline, "class='form-control form-date'");?></td>
+                <td><?php echo html::input('deadline', $task->deadline, "class='form-control form-date'");?></td>
               </tr>
               <tr>
                 <th><?php echo $lang->task->estimate;?></th>