diff --git a/module/release/control.php b/module/release/control.php
index 315beca6de..721e39b71f 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -112,14 +112,20 @@ class release extends control
*/
public function view($releaseID)
{
+ $this->loadModel('story');
+ $this->loadModel('bug');
$release = $this->release->getById((int)$releaseID);
if(!$release) die(js::error($this->lang->notFound) . js::locate('back'));
+ $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($release->stories)->fetchAll();
+ $bugs = $this->dao->select('*')->from(TABLE_BUG)->where('id')->in($release->bugs)->fetchAll();
$this->commonAction($release->product);
$this->view->header->title = $this->lang->release->view;
$this->view->position[] = $this->lang->release->view;
$this->view->release = $release;
+ $this->view->stories = $stories;
+ $this->view->bugs = $bugs;
$this->view->actions = $this->loadModel('action')->getList('release', $releaseID);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->display();
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 04fed85af8..dc60911361 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -25,3 +25,7 @@ $lang->release->name = 'Name';
$lang->release->date = 'Date';
$lang->release->desc = 'Desc';
$lang->release->linkStoriesAndBugs = 'Stories and bugs';
+$lang->release->linkStories = 'Stories';
+$lang->release->linkBugs = 'Bugs';
+$lang->release->linkedStories = 'Linked stories';
+$lang->release->linkedBugs = 'Linked bugs';
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index c77dde2e26..bbfa18af3d 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -25,3 +25,7 @@ $lang->release->name = '发布名称';
$lang->release->date = '发布日期';
$lang->release->desc = '描述';
$lang->release->linkStoriesAndBugs = '需求和Bugs';
+$lang->release->linkStories = '相关需求';
+$lang->release->linkBugs = '相关Bugs';
+$lang->release->linkedStories = '已关联需求';
+$lang->release->linkedBugs = '已关联Bugs';
diff --git a/module/release/view/ajaxgetstoriesandbugs.html.php b/module/release/view/ajaxgetstoriesandbugs.html.php
index d0d0dbf2a4..476c4dcea7 100644
--- a/module/release/view/ajaxgetstoriesandbugs.html.php
+++ b/module/release/view/ajaxgetstoriesandbugs.html.php
@@ -1,15 +1,13 @@
-
release->linkStoriesAndBugs;?> |
- story
-
-
- | idAB);?> |
- story->title);?> |
- story->stageAB);?> |
+ release->linkStories;?>
+
+ | idAB;?> |
+ story->title;?> |
+ story->stageAB;?> |
$story):?>
createLink('story', 'view', "storyID=$storyID");?>
@@ -23,15 +21,17 @@
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index d23386363b..2d8e791ee0 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -29,6 +29,49 @@
release->date;?> |
date;?> |
+
+ | release->linkedStories;?> |
+
+
+
+
+ | idAB;?> |
+ story->title;?> |
+ story->stageAB;?> |
+
+ $story):?>
+ createLink('story', 'view', "storyID=$storyID");?>
+
+ | id);?> |
+ title);?> |
+ story->stageList[$story->stage];?> |
+
+
+
+
+ |
+
+
+ | release->linkedBugs;?> |
+
+
+
+
+ | idAB;?> |
+ bug->title;?> |
+ bug->status;?> |
+
+
+
+ | id);?> |
+ id", $bug->title, '', "class='preview'");?> |
+ bug->statusList[$bug->status];?> |
+
+
+
+
+ |
+
| release->desc;?> |
desc;?> |
|