diff --git a/module/task/control.php b/module/task/control.php
index 7e45c22809..50424d3bd6 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -443,14 +443,15 @@ class task extends control
      */
     public function start(int $taskID, string $cardPosition = '')
     {
-        /* Common actions of task module and task. */
-        $this->taskZen->commonAction($taskID);
-        $task = $this->task->getById($taskID);
-
         /* Analytic parameter. */
         $cardPosition = str_replace(array(',', ' '), array('&', ''), $cardPosition);
         parse_str($cardPosition, $output);
 
+        /* Common actions of task module and task. */
+        $this->taskZen->commonAction($taskID);
+        $task        = $this->task->getById($taskID);
+        $currentTeam = empty($task->team) ? $this->task->getTeamByAccount($task->team) : '';
+
         /* Submit the data process after start the task form. */
         if(!empty($_POST))
         {
@@ -460,12 +461,13 @@ class task extends control
 
             /* Record task effort. */
             $effort = $this->buildEffortForStart($task, $taskData);
+            if($this->post->comment) $effort->work = $this->post->comment;
+            if($effort->consumed > 0) $effortID = $this->task->addTaskEffort($effort);
+            if($task->mode == 'linear' && !empty($effortID)) $this->task->updateEstimateOrder($effortID, $currentTeam->order);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             /* Start a task. */
-            $changes = $this->task->start($task, $taskData, $output);
-
-            /* If there is an error, return an error message. */
+            $changes = $this->task->start($task, $taskData);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             /* Update other data related to the task after it is started. */
@@ -486,7 +488,7 @@ class task extends control
         $this->view->members         = $this->user->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
         $this->view->assignedTo      = !empty($task->team) ? $this->task->getAssignedTo4Multi($task->team, $task) : $assignedTo;
         $this->view->canRecordEffort = $this->taskZen->checkRecordEffort($task);
-        $this->view->currentTeam     = empty($task->team) ? $this->task->getTeamByAccount($task->team) : '';
+        $this->view->currentTeam     = $currentTeam;
         $this->display();
     }
 
@@ -826,64 +828,53 @@ class task extends control
     }
 
     /**
-     * Restart task
+     * 重新开始一个任务。
+     * Restart a task.
      *
      * @param  int    $taskID
      * @param  string $from
      * @access public
      * @return void
      */
-    public function restart($taskID, $from = '')
+    public function restart(int $taskID, string $from = '')
     {
+        /* Common actions of task module and task. */
         $this->taskZen->commonAction($taskID);
-
-        $task = $this->task->getById($taskID);
+        $task        = $this->task->getById($taskID);
+        $currentTeam = empty($task->team) ? $this->task->getTeamByAccount($task->team) : '';
 
         if(!empty($_POST))
         {
-            $this->loadModel('action');
-            $changes = $this->task->start($taskID);
-            if(dao::isError()) return print(js::error(dao::getError()));
+            /* Prepare the data information before restart the task. */
+            $taskData = $this->taskZen->buildTaskForStart($task);
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            $act = $this->post->left == 0 ? 'Finished' : 'Restarted';
-            $actionID = $this->action->create('task', $taskID, $act, $this->post->comment);
+            /* Record task effort. */
+            $effort = $this->buildEffortForStart($task, $taskData);
+            if($this->post->comment) $effort->work = $this->post->comment;
+            if($effort->consumed > 0) $effortID = $this->task->addTaskEffort($effort);
+            if($task->mode == 'linear' && !empty($effortID)) $this->task->updateEstimateOrder($effortID, $currentTeam->order);
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+
+            /* Restart a task. */
+            $changes = $this->task->start($task, $taskData);
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+
+            $action   = $this->post->left == 0 ? 'Finished' : 'Restarted';
+            $actionID = $this->loadModel('action')->create('task', $taskID, $action, $this->post->comment);
             if(!empty($changes)) $this->action->logHistory($actionID, $changes);
 
             $this->executeHooks($taskID);
-
-            if(isonlybody())
-            {
-                $task         = $this->task->getById($taskID);
-                $execution    = $this->execution->getByID($task->execution);
-                $executionLaneType = $this->session->executionLaneType ? $this->session->executionLaneType : 'all';
-                $executionGroupBy  = $this->session->executionGroupBy ? $this->session->executionGroupBy : 'default';
-                if(($this->app->tab == 'execution' or ($this->config->vision == 'lite' and $this->app->tab == 'project')) and $execution->type == 'kanban')
-                {
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $executionLaneType, 'id_desc', 0, $executionGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
-
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
-                }
-                if($from == 'taskkanban')
-                {
-                    $taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
-                    $kanbanData      = $this->loadModel('kanban')->getExecutionKanban($task->execution, $executionLaneType, $executionGroupBy, $taskSearchValue);
-                    $kanbanType      = $executionLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData      = $kanbanData[$kanbanType];
-                    $kanbanData      = json_encode($kanbanData);
-
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
-                }
-                return print(js::closeModal('parent.parent', 'this'));
-            }
-            return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
+            $response = $this->taskZen->responseAfterChangeStatus($task, $from);
+            $this->send($response);
         }
 
-        $this->view->title      = $this->view->execution->name . $this->lang->colon .$this->lang->task->restart;
-        $this->view->users      = $this->loadModel('user')->getPairs('noletter');
-        $this->view->members    = $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
-        $this->view->assignedTo = $task->assignedTo == '' ? $this->app->user->account : $task->assignedTo;
+        $this->view->title           = $this->view->execution->name . $this->lang->colon .$this->lang->task->restart;
+        $this->view->users           = $this->loadModel('user')->getPairs('noletter');
+        $this->view->members         = $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
+        $this->view->assignedTo      = $task->assignedTo == '' ? $this->app->user->account : $task->assignedTo;
+        $this->view->canRecordEffort = $this->taskZen->checkRecordEffort($task);
+        $this->view->currentTeam     = $currentTeam;
         $this->display();
     }
 
diff --git a/module/task/ui/create.html.php b/module/task/ui/create.html.php
index 7f7b50fa05..6642f3d200 100644
--- a/module/task/ui/create.html.php
+++ b/module/task/ui/create.html.php
@@ -305,8 +305,11 @@ formPanel
     formGroup
     (
         set::label($lang->task->desc),
-        set::name('desc'),
-        set::control('editor'),
+        editor
+        (
+            set::name('desc'),
+            set::rows('5'),
+        )
     ),
     formGroup
     (
diff --git a/module/task/ui/pause.html.php b/module/task/ui/pause.html.php
index 9d0815f744..03c4e74fc1 100644
--- a/module/task/ui/pause.html.php
+++ b/module/task/ui/pause.html.php
@@ -21,8 +21,11 @@ formPanel
     formGroup
     (
         set::label($lang->comment),
-        set::name('comment'),
-        set::control('editor'),
+        editor
+        (
+            set::name('comment'),
+            set::rows('5'),
+        )
     ),
 );
 
diff --git a/module/task/ui/start.html.php b/module/task/ui/start.html.php
index e6b5ef9a9c..40be5e5f1a 100644
--- a/module/task/ui/start.html.php
+++ b/module/task/ui/start.html.php
@@ -102,8 +102,11 @@ else
         formGroup
         (
             set::label($lang->comment),
-            set::name('comment'),
-            set::control('editor'),
+            editor
+            (
+                set::name('comment'),
+                set::rows('5'),
+            )
         ),
     );
 }
diff --git a/module/task/zen.php b/module/task/zen.php
index ea4c1b2cc4..dc91974ffa 100644
--- a/module/task/zen.php
+++ b/module/task/zen.php
@@ -1187,9 +1187,9 @@ class taskZen extends task
      * @param  object    $oldTask
      * @param  object    $task
      * @access protected
-     * @return bool
+     * @return object
      */
-    protected function buildEffortForStart(object $oldTask, object $task): bool
+    protected function buildEffortForStart(object $oldTask, object $task): object
     {
         $currentTeam = !empty($oldTask->team) ? $this->task->getTeamByAccount($oldTask->team) : array();
 
@@ -1201,12 +1201,8 @@ class taskZen extends task
         $effort->work     = zget($task, 'work', '');
         $effort->account  = $this->app->user->account;
         $effort->consumed = !empty($oldTask->team) && $currentTeam ? $effort->consumed - $currentTeam->consumed : $effort->consumed - $oldTask->consumed;
-        if($this->post->comment) $effort->work = $this->post->comment;
 
-        if($effort->consumed > 0) $effortID = $this->task->addTaskEffort($effort);
-        if($oldTask->mode == 'linear' && !empty($effortID)) $this->task->updateEstimateOrder($effortID, $currentTeam->order);
-
-        return !dao::isError();
+        return $effort;
     }
 
     /**