diff --git a/module/story/control.php b/module/story/control.php
index b36dd2ce82..162dda35a8 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -308,6 +308,8 @@ class story extends control
         $story->files = $this->loadModel('file')->getByObject('story', $storyID);
         $product      = $this->dao->findById($story->product)->from(TABLE_PRODUCT)->fields('name, id')->fetch();
         $plan         = $this->dao->findById($story->plan)->from(TABLE_PRODUCTPLAN)->fetch('title');
+        $bugs         = $this->dao->select('id,title')->from(TABLE_BUG)->where('story')->eq($storyID)->fetchAll();
+        $cases        = $this->dao->select('id,title')->from(TABLE_CASE)->where('story')->eq($storyID)->fetchAll();
         $modulePath   = $this->tree->getParents($story->module);
         $users        = $this->user->getPairs('noletter');
 
@@ -322,6 +324,8 @@ class story extends control
         $this->view->position   = $position;
         $this->view->product    = $product;
         $this->view->plan       = $plan;
+        $this->view->bugs       = $bugs;
+        $this->view->cases      = $cases;
         $this->view->story      = $story;
         $this->view->users      = $users;
         $this->view->actions    = $this->action->getList('story', $storyID);
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index fc488b3784..b702f286fe 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -132,6 +132,8 @@ $lang->story->legendRelated        = 'Related info';
 $lang->story->legendMailto         = 'Maitto';
 $lang->story->legendAttatch        = 'Files';
 $lang->story->legendProjectAndTask = 'Project & task';
+$lang->story->legendBugs           = 'Related Bug';
+$lang->story->legendCases          = 'Related Case';
 $lang->story->legendLinkStories    = 'Related story';
 $lang->story->legendChildStories   = 'Child story';
 $lang->story->legendSpec           = 'Spec';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index fff6ea1f62..6a1f06e512 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -132,6 +132,8 @@ $lang->story->legendRelated        = '相关信息';
 $lang->story->legendMailto         = '抄送给';
 $lang->story->legendAttatch        = '附件';
 $lang->story->legendProjectAndTask = '项目任务';
+$lang->story->legendBugs           = '相关Bug';
+$lang->story->legendCases          = '相关用例';
 $lang->story->legendLinkStories    = '相关需求';
 $lang->story->legendChildStories   = '细分需求';
 $lang->story->legendSpec           = '需求描述';
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index d9652f5c73..f407f109e7 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -180,6 +180,38 @@
         </table>
       </fieldset>
 
+      <fieldset>
+        <legend><?php echo $lang->story->legendBugs;?></legend>
+        <table class='table-1 fixed'>
+          <tr>
+            <td>
+              <?php
+              foreach($bugs as $bug)
+              {
+                  echo '<span class="nobr">' . html::a($this->createLink('bug', 'view', "bugID=$bug->id"), "#$bug->id $bug->title") . '</span><br />';
+              }
+              ?>
+            </td>
+          </tr>
+        </table>
+      </fieldset>
+
+      <fieldset>
+        <legend><?php echo $lang->story->legendCases;?></legend>
+        <table class='table-1 fixed'>
+          <tr>
+            <td>
+              <?php
+              foreach($cases as $case)
+              {
+                  echo '<span class="nobr">' . html::a($this->createLink('testcase', 'view', "caseID=$case->id"), "#$case->id $case->title") . '</span><br />';
+              }
+              ?>
+            </td>
+          </tr>
+        </table>
+      </fieldset>
+
       <fieldset>
         <legend><?php echo $lang->story->legendLinkStories;?></legend>
         <div>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 68ffa6ed65..15c0aea7ff 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -132,7 +132,7 @@
             <td><?php echo $lang->testcase->statusList[$case->status];?></td>
           </tr>
            <tr>
-            <td class='rowhead'><?php echo $this->app->loadLang('testtask')->testtask->lastRun;?></td>
+            <td class='rowhead'><?php echo $this->app->loadLang('testtask')->testtask->lastRunTime;?></td>
             <td><?php if(!helper::isZeroDate($case->lastRun)) echo $case->lastRun;?></td>
           </tr>
           <tr>