From 68891fa0cf33f209cf579b58c043d349d60062fa Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 1 Sep 2015 15:09:37 +0800
Subject: [PATCH]  * finish task #2293.

---
 module/my/view/task.html.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 7daa3c2230..f20db29a74 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -32,6 +32,8 @@
       <th class='w-pri'>   <?php common::printOrderLink('pri',         $orderBy, $vars, $lang->priAB);?></th>
       <th class='w-150px'> <?php common::printOrderLink('project',     $orderBy, $vars, $lang->task->project);?></th>
       <th>                 <?php common::printOrderLink('name',        $orderBy, $vars, $lang->task->name);?></th>
+      <th class='w-user'>  <?php common::printOrderLink('assignedTo',  $orderBy, $vars, $lang->task->assignedTo);?></th>
+      <th class='w-user'>  <?php common::printOrderLink('finishedBy',  $orderBy, $vars, $lang->task->finishedBy);?></th>
       <th class='w-hour'>  <?php common::printOrderLink('estimate',    $orderBy, $vars, $lang->task->estimateAB);?></th>
       <th class='w-hour'>  <?php common::printOrderLink('consumed',    $orderBy, $vars, $lang->task->consumedAB);?></th>
       <th class='w-hour'>  <?php common::printOrderLink('left',        $orderBy, $vars, $lang->task->leftAB);?></th>
@@ -53,6 +55,8 @@
       <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
       <td class='nobr text-left'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
       <td class='text-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
+      <td><?php echo $users[$task->assignedTo];?></td>
+      <td><?php echo $users[$task->finishedBy];?></td>
       <td><?php echo $task->estimate;?></td>
       <td><?php echo $task->consumed;?></td>
       <td><?php echo $task->left;?></td>
@@ -74,7 +78,7 @@
     </tbody>
     <tfoot>
       <tr>
-        <td colspan='11'>
+        <td colspan='13'>
         <?php if(count($tasks)):?>
         <div class='table-actions clearfix'>
         <?php