* finish task#1439.

2013-07-17 09:12:04 +08:00
parent 2a3c6b09c3
commit 6c92b0ec48
29 changed files with 89 additions and 51 deletions
@@ -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,
@@ -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();
@@ -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'>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>