From b863fe5f92e354101cab49c9febb2b57e390e7c7 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Mon, 12 Nov 2018 17:00:22 +0800
Subject: [PATCH] * Finish task #5109.

---
 module/testtask/config.php         | 2 +-
 module/testtask/control.php        | 1 +
 module/testtask/model.php          | 2 +-
 module/testtask/view/edit.html.php | 4 ++++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/testtask/config.php b/module/testtask/config.php
index 130f031c8d..56e201e186 100644
--- a/module/testtask/config.php
+++ b/module/testtask/config.php
@@ -7,7 +7,7 @@ $config->testtask->edit->requiredFields   = 'project,build,begin,end,name';
 
 $config->testtask->editor = new stdclass();
 $config->testtask->editor->create  = array('id' => 'desc', 'tools' => 'simpleTools');
-$config->testtask->editor->edit    = array('id' => 'desc,report', 'tools' => 'simpleTools');
+$config->testtask->editor->edit    = array('id' => 'desc,report,comment', 'tools' => 'simpleTools');
 $config->testtask->editor->view    = array('id' => 'lastComment', 'tools' => 'simpleTools');
 $config->testtask->editor->start   = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->testtask->editor->close   = array('id' => 'report,comment', 'tools' => 'simpleTools');
diff --git a/module/testtask/control.php b/module/testtask/control.php
index cc24d6b0b1..92ecde705a 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -456,6 +456,7 @@ class testtask extends control
                 $actionID = $this->loadModel('action')->create('testtask', $taskID, 'edited');
                 $this->action->logHistory($actionID, $changes);
             }
+            if($this->post->comment != '') $actionID = $this->action->create('testtask', $taskID, 'Commented', $this->post->comment);
             die(js::locate(inlink('view', "taskID=$taskID"), 'parent'));
         }
 
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 0143100407..31ea1eb449 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -603,7 +603,7 @@ class testtaskModel extends model
     public function update($taskID)
     {
         $oldTask = $this->dao->select("*")->from(TABLE_TESTTASK)->where('id')->eq((int)$taskID)->fetch();
-        $task = fixer::input('post')->stripTags($this->config->testtask->editor->edit['id'], $this->config->allowedTags)->join('mailto', ',')->remove('uid')->get();
+        $task = fixer::input('post')->stripTags($this->config->testtask->editor->edit['id'], $this->config->allowedTags)->join('mailto', ',')->remove('uid,comment')->get();
         $task = $this->loadModel('file')->processImgURL($task, $this->config->testtask->editor->edit['id'], $this->post->uid);
         $this->dao->update(TABLE_TESTTASK)->data($task)
             ->autoCheck()
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 6882bf4ea6..19e33cc1ba 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -70,6 +70,10 @@
           <th><?php echo $lang->testtask->desc;?></th>
           <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows=10 class='form-control'");?></td>
         </tr>
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td colspan='2'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->testtask->mailto;?></th>
           <td colspan='2'>