From e4efa79e5729c005449889d6d6a1299b4f9dba64 Mon Sep 17 00:00:00 2001
From: chujilu <chujilu1991@163.com>
Date: Tue, 12 Aug 2014 11:30:43 +0800
Subject: [PATCH] * show story spec in task view

---
 module/task/control.php        | 4 +++-
 module/task/lang/en.php        | 1 +
 module/task/lang/zh-cn.php     | 1 +
 module/task/view/view.html.php | 4 ++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/task/control.php b/module/task/control.php
index c4be50db85..eada0d42c4 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -387,7 +387,9 @@ class task extends control
      */
     public function view($taskID)
     {
-        $task = $this->task->getById($taskID, true);
+        $task            = $this->task->getById($taskID, true);
+        $story           = $this->story->getById($task->story);
+        $task->storySpec = ($story != null) ? $story->spec : '';
         if(!$task) die(js::error($this->lang->notFound) . js::locate('back'));
 
         /* Update action. */
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 05646974a7..a002eef3f1 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -36,6 +36,7 @@ $lang->task->id                = 'ID';
 $lang->task->project           = 'Project';
 $lang->task->module            = 'Module';
 $lang->task->story             = 'Story';
+$lang->task->storySpec         = 'Story desc';
 $lang->task->storyVersion      = 'Version';
 $lang->task->name              = 'Name';
 $lang->task->type              = 'Type';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index f66f2d4e44..c04127ac22 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -36,6 +36,7 @@ $lang->task->id                = '编号';
 $lang->task->project           = '所属项目';
 $lang->task->module            = '所属模块';
 $lang->task->story             = '相关需求';
+$lang->task->storySpec         = '需求描述';
 $lang->task->storyVersion      = '需求版本';
 $lang->task->name              = '任务名称';
 $lang->task->type              = '任务类型';
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index f15ff9e7de..ac00c41d36 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -69,6 +69,10 @@
         <legend><?php echo $lang->task->legendDesc;?></legend>
         <div class='article-content'><?php echo $task->desc;?></div>
       </fieldset>
+      <fieldset>
+        <legend><?php echo $lang->task->storySpec;?></legend>
+        <div class='article-content'><?php echo $task->storySpec;?></div>
+      </fieldset>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='actions'> <?php if(!$task->deleted) echo $actionLinks;?></div>