From c38fb7980b68fb25f755b0390b2c1f40c1fccf71 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Wed, 24 Nov 2010 13:34:30 +0000
Subject: [PATCH]  * adjust task table.

---
 module/story/model.php              | 2 +-
 module/story/view/affected.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index b89cba2856..28c7a07a17 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -37,7 +37,7 @@ class storyModel extends model
             ->where('t1.story')->eq($storyID)
             ->orderBy('t1.project DESC')
             ->fetchAll('project');
-        $story->tasks     = $this->dao->select('id, name, owner, project, status, consumed, `left`')->from(TABLE_TASK)->where('story')->eq($storyID)->orderBy('id DESC')->fetchGroup('project');
+        $story->tasks     = $this->dao->select('id, name, assignedTo, project, status, consumed, `left`')->from(TABLE_TASK)->where('story')->eq($storyID)->orderBy('id DESC')->fetchGroup('project');
         //$story->bugCount  = $this->dao->select('COUNT(*)')->alias('count')->from(TABLE_BUG)->where('story')->eq($storyID)->fetch('count');
         //$story->caseCount = $this->dao->select('COUNT(*)')->alias('count')->from(TABLE_CASE)->where('story')->eq($storyID)->fetch('count');
         if($story->toBug) $story->toBugTitle = $this->dao->findById($story->toBug)->from(TABLE_BUG)->fetch('title');
diff --git a/module/story/view/affected.html.php b/module/story/view/affected.html.php
index adef69c454..f738a78e18 100644
--- a/module/story/view/affected.html.php
+++ b/module/story/view/affected.html.php
@@ -10,7 +10,7 @@
         <tr class='colhead'>
           <th><?php echo $lang->task->id;?></th>
           <th><?php echo $lang->task->name;?></th>
-          <th><?php echo $lang->task->owner;?></th>
+          <th><?php echo $lang->task->assignedTo;?></th>
           <th><?php echo $lang->task->status;?></th>
           <th><?php echo $lang->task->consumed;?></th>
           <th><?php echo $lang->task->left;?></th>
@@ -20,7 +20,7 @@
         <tr class='a-center'>
           <td><?php echo $task->id;?></td>
           <td class='a-left'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?></td>
-          <td><?php echo $users[$task->owner];?></td>
+          <td><?php echo $users[$task->assignedTo];?></td>
           <td><?php echo $lang->task->statusList[$task->status];?></td>
           <td><?php echo $task->consumed;?></td>
           <td><?php echo $task->left;?></td>