* add link stories and bugs into the view of build.

2012-01-02 09:15:36 +00:00
parent cf2e89aefc
commit 1fa838e6b4
8 changed files with 84 additions and 18 deletions
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -29,3 +29,7 @@ $lang->build->scmPath   = 'Source code path';
 $lang->build->filePath  = 'Package file path';
 $lang->build->desc      = 'Desc';
 $lang->build->linkStoriesAndBugs  = 'stories and bugs';
+$lang->build->linkStories        = 'Stories';
+$lang->build->linkBugs           = 'Bugs';
+$lang->build->linkedStories      = 'Linked stories';
+$lang->build->linkedBugs         = 'Linked bugs';
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -29,3 +29,7 @@ $lang->build->scmPath   = '源代码地址';
 $lang->build->filePath  = '存储地址';
 $lang->build->desc      = '描述';
 $lang->build->linkStoriesAndBugs  = '关联需求和Bug';
+$lang->build->linkStories        = '相关需求';
+$lang->build->linkBugs           = '相关Bugs';
+$lang->build->linkedStories      = '已关联需求';
+$lang->build->linkedBugs         = '已关联Bugs';
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -46,12 +46,11 @@
        <div class="w-p90">
          <div class='half-left' style="height:225px; overflow-y:auto">
            <table class='table-1'>
-              <caption>story</caption>
-              <tr class='colhead'>
-              <?php $vars = "projectID=$projectID&orderBy=%s"; ?>
-                <th class='w-id {sorter:false}'>    <?php common::printOrderLink('id',     $orderBy, $vars, $lang->idAB);?></th>
-                <th class= '{sorter:false}'>        <?php common::printOrderLink('title',  $orderBy, $vars, $lang->story->title);?></th>
-                <th class='w-100px {sorter:false}'> <?php common::printOrderLink('stage',  $orderBy, $vars, $lang->story->stageAB);?></th>
+            <caption><?php echo $lang->build->linkStories;?></caption>
+              <tr>
+                <th class='w-id'><?php echo $lang->idAB;?></th>
+                <th><?php echo $lang->story->title;?></th>
+                <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
              </tr>
              <?php foreach($stories as $key => $story):?>
              <?php
@@ -67,15 +66,17 @@
          </div>
          <div class='half-right' style="height:225px; overflow-y:auto">
            <table class='table-1'>
-              <caption>bug</caption>
-              <tr class='colhead'>
+              <caption><?php echo $lang->build->linkBugs;?></caption>
+              <tr>
                <th class='w-id'>       <?php echo $lang->idAB;?></th>
                <th><?php echo $lang->bug->title;?></th>
+                <th class='w-100px'><?php echo $lang->bug->status;?></th>
              </tr>
              <?php foreach($bugs as $bug):?>
              <tr class='a-center'>
                <td><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" checked> <?php echo sprintf('%03d', $bug->id);?></td>
                <td class='a-left nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'");?></td>
+                <td><?php echo $lang->bug->statusList[$bug->status];?></td>
              </tr>
              <?php endforeach;?>
            </table>
--- 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();
--- 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';
--- 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';
--- a/module/release/view/ajaxgetstoriesandbugs.html.php
+++ b/module/release/view/ajaxgetstoriesandbugs.html.php
@@ -1,15 +1,13 @@
-<?php $stories = $stories;?>
 <th class='rowhead'><?php echo $lang->release->linkStoriesAndBugs;?></th>
 <td>
  <div class="w-p90">
    <div class='half-left' style="height:225px; overflow-y:auto">
      <table class='table-1'>
-        <caption>story</caption>
-        <tr class='colhead'>
-        <?php $vars = "productID=$productID&orderBy=%s"; ?>
-          <th class='w-id {sorter:false}'>    <?php common::printOrderLink('id',     "$orderBy", $vars, $lang->idAB);?></th>
-          <th class= '{sorter:false}'>        <?php common::printOrderLink('title',  "$orderBy", $vars, $lang->story->title);?></th>
-          <th class='w-100px {sorter:false}'> <?php common::printOrderLink('stage',  "$orderBy", $vars, $lang->story->stageAB);?></th>
+        <caption><?php echo $lang->release->linkStories;?></caption>
+        <tr>
+          <th class='w-id'><?php echo $lang->idAB;?></th>
+          <th><?php echo $lang->story->title;?></th>
+          <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
        </tr>
        <?php foreach($stories as $storyID => $story):?>
        <?php $storyLink = $this->createLink('story', 'view', "storyID=$storyID");?>
@@ -23,15 +21,17 @@
    </div>
    <div class='half-right' style="height:225px; overflow-y:auto">
      <table class='table-1'>
-        <caption>bug</caption>
-        <tr class='colhead'>
+        <caption><?php echo $lang->release->linkBugs;?></caption>
+        <tr>
          <th class='w-id'>       <?php echo $lang->idAB;?></th>
          <th><?php echo $lang->bug->title;?></th>
+          <th class='w-100px'><?php echo $lang->bug->status;?></th>
        </tr>
-        <?php foreach($bugs[$key] as $bug):?>
+        <?php foreach($bugs as $bug):?>
        <tr class='a-center'>
          <td><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" checked> <?php echo sprintf('%03d', $bug->id);?></td>
          <td class='a-left nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'");?></td>
+          <td><?php echo $lang->bug->statusList[$bug->status];?></td>
        </tr>
        <?php endforeach;?>
      </table>
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -29,6 +29,49 @@
    <th class='rowhead'><?php echo $lang->release->date;?></th>
    <td><?php echo $release->date;?></td>
  </tr>  
+  <tr>
+    <th class='rowhead'><?php echo $lang->release->linkedStories;?></th>
+    <td>
+      <div style="height:225px; overflow-y:auto">
+        <table class='table-1'>
+          <tr>
+            <th class='w-id'><?php echo $lang->idAB;?></th>
+            <th><?php echo $lang->story->title;?></th>
+            <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
+          </tr>
+          <?php foreach($stories as $storyID => $story):?>
+          <?php $storyLink = $this->createLink('story', 'view', "storyID=$storyID");?>
+          <tr class='a-center'>
+            <td><?php echo sprintf('%03d', $story->id);?></td>
+            <td class='a-left nobr'><?php echo html::a($storyLink,$story->title);?></td>
+            <td><?php echo $lang->story->stageList[$story->stage];?></td>
+          </tr>
+          <?php endforeach;?>
+        </table>
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->release->linkedBugs;?></th>
+    <td>
+      <div style="height:225px; overflow-y:auto">
+        <table class='table-1'>
+          <tr>
+            <th class='w-id'>       <?php echo $lang->idAB;?></th>
+            <th><?php echo $lang->bug->title;?></th>
+            <th class='w-100px'><?php echo $lang->bug->status;?></th>
+          </tr>
+          <?php foreach($bugs as $bug):?>
+          <tr class='a-center'>
+            <td><?php echo sprintf('%03d', $bug->id);?></td>
+            <td class='a-left nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'");?></td>
+            <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+          </tr>
+          <?php endforeach;?>
+        </table>
+      </div>
+    </td>
+  </tr>
  <tr>
    <th class='rowhead'><?php echo $lang->release->desc;?></th>
    <td class='content'><?php echo $release->desc;?></td>