From 6c92b0ec48f18aa2e80401be144bb338a4d2bd04 Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Wed, 17 Jul 2013 09:12:04 +0800
Subject: [PATCH]  * finish task#1439.

---
 module/bug/config.php                 | 11 ++++--
 module/bug/view/activate.html.php     |  5 +--
 module/bug/view/assignto.html.php     |  3 +-
 module/bug/view/close.html.php        |  5 +--
 module/bug/view/confirmbug.html.php   |  3 +-
 module/bug/view/resolve.html.php      |  5 +--
 module/doc/config.php                 |  2 +-
 module/product/config.php             |  1 +
 module/product/view/close.html.php    |  1 +
 module/project/config.php             |  3 ++
 module/project/view/close.html.php    |  1 +
 module/project/view/putoff.html.php   |  1 +
 module/project/view/suspend.html.php  |  1 +
 module/story/config.php               |  2 ++
 module/story/control.php              |  4 +--
 module/story/view/close.html.php      |  4 +--
 module/story/view/header.html.php     |  1 +
 module/task/config.php                | 12 +++++--
 module/task/model.php                 | 48 +++++++++++++--------------
 module/task/view/activate.html.php    |  3 +-
 module/task/view/assignto.html.php    |  3 +-
 module/task/view/cancel.html.php      |  3 +-
 module/task/view/close.html.php       |  3 +-
 module/task/view/finish.html.php      |  3 +-
 module/task/view/start.html.php       |  3 +-
 module/testtask/config.php            |  1 +
 module/testtask/control.php           |  4 ++-
 module/testtask/view/runcase.html.php |  3 +-
 module/testtask/view/start.html.php   |  1 +
 29 files changed, 89 insertions(+), 51 deletions(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index 5ad1aeee5d..82fa60c9ad 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -38,9 +38,14 @@ $config->bug->list->exportFields = 'id, product, module, project, story, task,
     lastEditedDate, files';
 
 $config->bug->editor = new stdclass();
-$config->bug->editor->create = array('id' => 'steps', 'tools' => 'bugTools');
-$config->bug->editor->edit   = array('id' => 'steps,comment', 'tools' => 'bugTools');
-$config->bug->editor->view   = array('id' => 'comment', 'tools' => 'bugTools');
+$config->bug->editor->create     = array('id' => 'steps', 'tools' => 'bugTools');
+$config->bug->editor->edit       = array('id' => 'steps,comment', 'tools' => 'bugTools');
+$config->bug->editor->view       = array('id' => 'comment', 'tools' => 'bugTools');
+$config->bug->editor->confirmbug = array('id' => 'comment', 'tools' => 'bugTools');
+$config->bug->editor->assignto   = array('id' => 'comment', 'tools' => 'bugTools');
+$config->bug->editor->resolve    = array('id' => 'comment', 'tools' => 'bugTools');
+$config->bug->editor->close      = array('id' => 'comment', 'tools' => 'bugTools');
+$config->bug->editor->activate   = array('id' => 'comment', 'tools' => 'bugTools');
 
 global $lang;
 $config->bug->search['module']                   = 'bug';
diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index 7ab3d6ce86..23bbaa1a2a 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -6,11 +6,12 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     bug
- * @version     $Id$
+ * @version     $Id: activate.html.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $bug->title;?></caption>
@@ -24,7 +25,7 @@
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->bug->files;?></th>
diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index 5819b71ae5..297b486885 100644
--- a/module/bug/view/assignto.html.php
+++ b/module/bug/view/assignto.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php 
 include '../../common/view/header.html.php';
+include '../../common/view/kindeditor.html.php';
 include '../../common/view/autocomplete.html.php';
 js::set('holders', $lang->bug->placeholder);
 js::set('userList', array_keys($users));
@@ -30,7 +31,7 @@ js::set('page', 'assignedto');
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php
index 995e4ba9be..4001a50f78 100644
--- a/module/bug/view/close.html.php
+++ b/module/bug/view/close.html.php
@@ -6,17 +6,18 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     bug
- * @version     $Id$
+ * @version     $Id: close.html.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $bug->title;?></caption>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'>
diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php
index afd357d3be..49cd4ed029 100755
--- a/module/bug/view/confirmbug.html.php
+++ b/module/bug/view/confirmbug.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php
 include '../../common/view/header.html.php';
+include '../../common/view/kindeditor.html.php';
 include '../../common/view/autocomplete.html.php';
 js::set('holders', $lang->bug->placeholder);
 js::set('userList', array_keys($users));
@@ -31,7 +32,7 @@ js::set('page', 'confirmbug');
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index 8e9639f204..b6b6f3837c 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -6,11 +6,12 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     bug
- * @version     $Id$
+ * @version     $Id: resolve.html.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $bug->title;?></caption>
@@ -36,7 +37,7 @@
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'>
diff --git a/module/doc/config.php b/module/doc/config.php
index 7620c069bd..ceb520a104 100644
--- a/module/doc/config.php
+++ b/module/doc/config.php
@@ -14,7 +14,7 @@ $config->doc->edit->requiredFields   = 'title';
 
 $config->doc->editor = new stdclass();
 $config->doc->editor->create = array('id' => 'content', 'tools' => 'fullTools');
-$config->doc->editor->edit   = array('id' => 'content,comment', 'tools' => 'fullTools');
+$config->doc->editor->edit   = array('id' => 'content,digest,comment', 'tools' => 'fullTools');
 
 $config->doc->search['module']                   = 'doc';
 $config->doc->search['fields']['title']          = $lang->doc->title;
diff --git a/module/product/config.php b/module/product/config.php
index c35bdca807..83a2c6d62d 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -76,3 +76,4 @@ $config->product->edit->requiredFields   = 'name,code';
 $config->product->editor = new stdclass();
 $config->product->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
 $config->product->editor->edit   = array('id' => 'desc', 'tools' => 'simpleTools');
+$config->product->editor->close  = array('id' => 'comment', 'tools' => 'simpleTools');
diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php
index 02113684d7..b7d398ff09 100644
--- a/module/product/view/close.html.php
+++ b/module/product/view/close.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $product->name;?></caption>
diff --git a/module/project/config.php b/module/project/config.php
index 5daf775b45..843ffd7dd5 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -14,6 +14,9 @@ $config->project->edit->requiredFields   = 'name,code,begin,end';
 $config->project->editor = new stdclass();
 $config->project->editor->create = array('id' => 'desc,goal', 'tools' => 'simpleTools');
 $config->project->editor->edit   = array('id' => 'desc,goal', 'tools' => 'simpleTools');
+$config->project->editor->putoff = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->project->editor->close  = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->project->editor->suspend = array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->project->search['module']                   = 'task';
 $config->project->search['fields']['name']           = $lang->task->name;
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php
index c6dd89f72d..f8e1820f43 100644
--- a/module/project/view/close.html.php
+++ b/module/project/view/close.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $project->name;?></caption>
diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php
index 9a76baf1f4..ec05c2d633 100644
--- a/module/project/view/putoff.html.php
+++ b/module/project/view/putoff.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
 <form method='post' target='hiddenwin'>
diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php
index c6dd89f72d..f8e1820f43 100644
--- a/module/project/view/suspend.html.php
+++ b/module/project/view/suspend.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $project->name;?></caption>
diff --git a/module/story/config.php b/module/story/config.php
index 5c7bd276b7..ddd5e0bb91 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -26,6 +26,8 @@ $config->story->editor->create = array('id' => 'spec,verify', 'tools' => 'simple
 $config->story->editor->change = array('id' => 'spec,verify,comment', 'tools' => 'simpleTools');
 $config->story->editor->edit   = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->story->editor->view   = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->story->editor->close  = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->story->editor->review = array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->story->list = new stdclass();
 $config->story->list->exportFields = '
diff --git a/module/story/control.php b/module/story/control.php
index 69d6512243..0fb52ca9bc 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     story
- * @version     $Id$
+ * @version     $Id: control.php 5145 2013-07-15 06:47:26Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 class story extends control
@@ -645,7 +645,7 @@ class story extends control
             {
                 foreach($allChanges as $storyID => $changes)
                 {
-                    $actionID = $this->action->create('story', $storyID, 'Closed', $this->post->comments[$storyID], ucfirst($this->post->closedReasons[$storyID]));
+                    $actionID = $this->action->create('story', $storyID, 'Closed', htmlspecialchars($this->post->comments[$storyID]), ucfirst($this->post->closedReasons[$storyID]));
                     $this->action->logHistory($actionID);
                     $this->sendMail($storyID, $actionID);
                 }
diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php
index e7328fcc85..4a4794c954 100644
--- a/module/story/view/close.html.php
+++ b/module/story/view/close.html.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     story
- * @version     $Id$
+ * @version     $Id: close.html.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
 ?>
@@ -28,7 +28,7 @@
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->story->comment;?></th>
-      <td><?php echo html::textarea('comment', '', "rows='8' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='8' class='w-p98'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'>
diff --git a/module/story/view/header.html.php b/module/story/view/header.html.php
index f4b06ab331..64fce3444f 100644
--- a/module/story/view/header.html.php
+++ b/module/story/view/header.html.php
@@ -1,5 +1,6 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/autocomplete.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <?php if(isset($users)) js::set('userList', array_keys($users)); ?>
 <script language='Javascript'>
 function loadProduct(productID)
diff --git a/module/task/config.php b/module/task/config.php
index 3d7d32bee2..1bf8a1203d 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -18,9 +18,15 @@ $config->task->batchEdit = new stdclass();
 $config->task->batchEdit->columns = 13;
 
 $config->task->editor = new stdclass();
-$config->task->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
-$config->task->editor->edit   = array('id' => 'desc,comment', 'tools' => 'simpleTools');
-$config->task->editor->view   = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->task->editor->create   = array('id' => 'desc', 'tools' => 'simpleTools');
+$config->task->editor->edit     = array('id' => 'desc,comment', 'tools' => 'simpleTools');
+$config->task->editor->view     = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->task->editor->assignto = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->task->editor->start    = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->task->editor->finish   = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->task->editor->close    = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->task->editor->activate = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->task->editor->cancel   = array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->task->exportFields = '
     id, project, module, story,
diff --git a/module/task/model.php b/module/task/model.php
index 0efab53c66..0143e4aca6 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     task
- * @version     $Id$
+ * @version     $Id: model.php 5154 2013-07-16 05:51:02Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 ?>
@@ -274,15 +274,15 @@ class taskModel extends model
 
             switch($task->status)
             {
-            case 'done':
-            {
-                $task->left = 0;
-                if(!$task->finishedBy)   $task->finishedBy = $this->app->user->account;
-                if($task->closedReason)  $task->closedDate = $now;
-                $task->finishedDate = $oldTask->status == 'done' ?  $oldTask->finishedDate : $now;
-            }
-            break;
-        case 'cancel':
+                case 'done':
+                {
+                    $task->left = 0;
+                    if(!$task->finishedBy)   $task->finishedBy = $this->app->user->account;
+                    if($task->closedReason)  $task->closedDate = $now;
+                    $task->finishedDate = $oldTask->status == 'done' ?  $oldTask->finishedDate : $now;
+                    }
+                break;
+                case 'cancel':
                 {
                     $task->assignedTo   = $oldTask->openedBy;
                     $task->assignedDate = $now;
@@ -290,19 +290,19 @@ class taskModel extends model
                     if(!$task->canceledBy)   $task->canceledBy   = $this->app->user->account;
                     if(!$task->canceledDate) $task->canceledDate = $now;
                 }
-            break;
-        case 'closed':
-                    {
-                        if(!$task->closedBy)   $task->closedBy   = $this->app->user->account;
-                        if(!$task->closedDate) $task->closedDate = $now;
-                    }
-            break;
-        case 'wait':
-                        {
-                            if($task->consumed > 0 and $task->left > 0) $task->status = 'doing';
-                            if($task->left == $oldTask->left and $task->consumed == 0) $task->left = $task->estimate;
-                        }
-        default:break;
+                break;
+                case 'closed':
+                {
+                    if(!$task->closedBy)   $task->closedBy   = $this->app->user->account;
+                    if(!$task->closedDate) $task->closedDate = $now;
+                }
+                break;
+                case 'wait':
+                {
+                    if($task->consumed > 0 and $task->left > 0) $task->status = 'doing';
+                    if($task->left == $oldTask->left and $task->consumed == 0) $task->left = $task->estimate;
+                }
+                default:break;
             }
             if($task->assignedTo) $task->assignedDate = $now;
 
@@ -453,7 +453,7 @@ class taskModel extends model
         {
             $consumed += $estimate->consumed;
             $left      = $estimate->left;
-            $work      = $estimate->work;
+            $work      = htmlspecialchars($estimate->work);
             $this->dao->insert(TABLE_TASKESTIMATE)->data($estimate) 
                 ->autoCheck()
                 ->exec();
diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index bc54fdfd00..4b230c5c5b 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $task->name;?></caption>
@@ -24,7 +25,7 @@
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'>
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index 42815496a4..f24e7a87c5 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $task->name;?></caption>
@@ -24,7 +25,7 @@
     </tr>  
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'><?php echo html::submitButton();?></td>
diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php
index de5ba33383..d7a03dd743 100644
--- a/module/task/view/cancel.html.php
+++ b/module/task/view/cancel.html.php
@@ -11,12 +11,13 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $task->name;?></caption>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
   </table>
diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php
index 823fa6da2e..63112797d7 100644
--- a/module/task/view/close.html.php
+++ b/module/task/view/close.html.php
@@ -11,12 +11,13 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $task->name;?></caption>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'><?php echo html::submitButton();?></td>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index fa2413e8ae..6a878a6d91 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <caption><?php echo $task->name;?></caption>
@@ -29,7 +30,7 @@
 
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'><?php echo html::submitButton();?></td>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index 6c81142db6..ffb37f3d79 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('confirmFinish', $lang->task->confirmFinish);?>
 <form method='post' target='hiddenwin' onsubmit='return checkLeft();'>
@@ -30,7 +31,7 @@
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'><?php echo html::submitButton(); ?></td>
diff --git a/module/testtask/config.php b/module/testtask/config.php
index 2bdb5e828b..7d2a2c7fac 100644
--- a/module/testtask/config.php
+++ b/module/testtask/config.php
@@ -8,4 +8,5 @@ $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->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 f87dbe6f24..37c899c57a 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     testtask
- * @version     $Id$
+ * @version     $Id: control.php 5114 2013-07-12 06:02:59Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 class testtask extends control
@@ -557,6 +557,8 @@ class testtask extends control
         $this->view->run      = $run;
         $this->view->preCase  = $preCase;
         $this->view->nextCase = $nextCase;
+        $this->view->results  = $this->testtask->getResults(0, $caseID);
+        $this->view->users    = $this->loadModel('user')->getPairs('noclosed, noletter');
 
         die($this->display());
     }
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 874ccfc1d1..e9e1b48c51 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     testtask
- * @version     $Id$
+ * @version     $Id: runcase.html.php 4723 2013-05-03 05:19:29Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 ?>
@@ -58,4 +58,5 @@
     </tr>
   </table>
 </form>
+<?php $case = $run->case; include './results.html.php'; ?>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/testtask/view/start.html.php b/module/testtask/view/start.html.php
index 2fa93cefc5..37fc44b64f 100644
--- a/module/testtask/view/start.html.php
+++ b/module/testtask/view/start.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>