From dc7f7362a26d993a9803e114a2d19ce2068bfafd Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Thu, 26 Apr 2018 16:11:17 +0800
Subject: [PATCH] * Optimize codes.

---
 module/release/js/view.js              |  3 +-
 module/release/lang/en.php             | 60 +++++++++++++-------------
 module/release/lang/zh-cn.php          | 60 +++++++++++++-------------
 module/release/view/linkbug.html.php   | 21 ++++-----
 module/release/view/linkstory.html.php | 13 +++---
 5 files changed, 77 insertions(+), 80 deletions(-)

diff --git a/module/release/js/view.js b/module/release/js/view.js
index bc98ca25c3..db4e8df12f 100644
--- a/module/release/js/view.js
+++ b/module/release/js/view.js
@@ -11,7 +11,8 @@ function showLink(releaseID, type, param)
 
         var formID = type == 'story' ? '#unlinkedStoriesForm' : (type == 'leftBug' ? '#unlinkedLeftBugsForm' : '#unlinkedBugsForm');
         setTimeout(function(){fixedTfootAction(formID)}, 100);
-        checkTable($(formID).find('table'));
+
+        $('[data-ride="table"]').table();
     });
 }
 $(function()
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 99c0701d6a..90c6bec314 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -9,15 +9,15 @@
  * @version     $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common    = 'Release';
-$lang->release->create    = "Create";
-$lang->release->edit      = "Edit";
-$lang->release->linkStory = "Link Story";
-$lang->release->linkBug   = "Link Bug";
-$lang->release->delete    = "Delete";
-$lang->release->deleted   = 'Deleted';
-$lang->release->view      = "Overview";
-$lang->release->browse    = "Browse";
+$lang->release->common           = 'Release';
+$lang->release->create           = "Create";
+$lang->release->edit             = "Edit";
+$lang->release->linkStory        = "Link Story";
+$lang->release->linkBug          = "Link Bug";
+$lang->release->delete           = "Delete";
+$lang->release->deleted          = 'Deleted';
+$lang->release->view             = "Overview";
+$lang->release->browse           = "Browse";
 $lang->release->changeStatus     = "Change Status";
 $lang->release->batchUnlink      = "Batch Unlink";
 $lang->release->batchUnlinkStory = "Batch Unlink Story";
@@ -29,27 +29,27 @@ $lang->release->confirmUnlinkBug   = "Do you want to remove this Bug?";
 
 $lang->release->basicInfo = 'Basic Info';
 
-$lang->release->id                    = 'ID';
-$lang->release->product               = $lang->productCommon;
-$lang->release->branch                = 'Platform/Branch';
-$lang->release->build                 = 'Build';
-$lang->release->name                  = 'Name';
-$lang->release->marker                = 'Marker';
-$lang->release->date                  = 'Date';
-$lang->release->desc                  = 'Description';
-$lang->release->status                = 'Status';
-$lang->release->last                  = 'Last Release';
-$lang->release->unlinkStory           = 'Unlink Story';
-$lang->release->unlinkBug             = 'Unlink Bug';
-$lang->release->stories               = 'Finished Story';
-$lang->release->bugs                  = 'Solved Bug';
-$lang->release->leftBugs              = 'Remained Bug';
-$lang->release->generatedBugs         = 'Remained Bug';
-$lang->release->finishStories         = 'Finished %s Story';
-$lang->release->resolvedBugs          = 'Solved %s Bug';
-$lang->release->createdBugs           = 'Generated %s Bug';
-$lang->release->export                = 'Export as HTML';
-$lang->release->yesterday             = 'Released Yesterday';
+$lang->release->id            = 'ID';
+$lang->release->product       = $lang->productCommon;
+$lang->release->branch        = 'Platform/Branch';
+$lang->release->build         = 'Build';
+$lang->release->name          = 'Name';
+$lang->release->marker        = 'Marker';
+$lang->release->date          = 'Date';
+$lang->release->desc          = 'Description';
+$lang->release->status        = 'Status';
+$lang->release->last          = 'Last Release';
+$lang->release->unlinkStory   = 'Unlink Story';
+$lang->release->unlinkBug     = 'Unlink Bug';
+$lang->release->stories       = 'Finished Story';
+$lang->release->bugs          = 'Solved Bug';
+$lang->release->leftBugs      = 'Remained Bug';
+$lang->release->generatedBugs = 'Remained Bug';
+$lang->release->finishStories = 'Finished %s Story';
+$lang->release->resolvedBugs  = 'Solved %s Bug';
+$lang->release->createdBugs   = 'Generated %s Bug';
+$lang->release->export        = 'Export as HTML';
+$lang->release->yesterday     = 'Released Yesterday';
 
 $lang->release->filePath = 'Download : ';
 $lang->release->scmPath  = 'SCM Path : ';
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 89cee4428d..572e89651a 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -9,15 +9,15 @@
  * @version     $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->release->common    = '发布';
-$lang->release->create    = "创建发布";
-$lang->release->edit      = "编辑发布";
-$lang->release->linkStory = "关联需求";
-$lang->release->linkBug   = "关联Bug";
-$lang->release->delete    = "删除发布";
-$lang->release->deleted   = '已删除';
-$lang->release->view      = "发布详情";
-$lang->release->browse    = "浏览发布";
+$lang->release->common           = '发布';
+$lang->release->create           = "创建发布";
+$lang->release->edit             = "编辑发布";
+$lang->release->linkStory        = "关联需求";
+$lang->release->linkBug          = "关联Bug";
+$lang->release->delete           = "删除发布";
+$lang->release->deleted          = '已删除';
+$lang->release->view             = "发布详情";
+$lang->release->browse           = "浏览发布";
 $lang->release->changeStatus     = "修改状态";
 $lang->release->batchUnlink      = "批量移除";
 $lang->release->batchUnlinkStory = "批量移除需求";
@@ -29,27 +29,27 @@ $lang->release->confirmUnlinkBug   = "您确认移除该Bug吗？";
 
 $lang->release->basicInfo = '基本信息';
 
-$lang->release->id                    = 'ID';
-$lang->release->product               = $lang->productCommon;
-$lang->release->branch                = '平台/分支';
-$lang->release->build                 = '版本';
-$lang->release->name                  = '发布名称';
-$lang->release->marker                = '里程碑';
-$lang->release->date                  = '发布日期';
-$lang->release->desc                  = '描述';
-$lang->release->status                = '状态';
-$lang->release->last                  = '上次发布';
-$lang->release->unlinkStory           = '移除需求';
-$lang->release->unlinkBug             = '移除Bug';
-$lang->release->stories               = '完成的需求';
-$lang->release->bugs                  = '解决的Bug';
-$lang->release->leftBugs              = '遗留的Bug';
-$lang->release->generatedBugs         = '遗留的Bug';
-$lang->release->finishStories         = '本次共完成 %s 个需求';
-$lang->release->resolvedBugs          = '本次共解决 %s 个Bug';
-$lang->release->createdBugs           = '本次共遗留 %s 个Bug';
-$lang->release->export                = '导出HTML';
-$lang->release->yesterday             = '昨日发布';
+$lang->release->id            = 'ID';
+$lang->release->product       = $lang->productCommon;
+$lang->release->branch        = '平台/分支';
+$lang->release->build         = '版本';
+$lang->release->name          = '发布名称';
+$lang->release->marker        = '里程碑';
+$lang->release->date          = '发布日期';
+$lang->release->desc          = '描述';
+$lang->release->status        = '状态';
+$lang->release->last          = '上次发布';
+$lang->release->unlinkStory   = '移除需求';
+$lang->release->unlinkBug     = '移除Bug';
+$lang->release->stories       = '完成的需求';
+$lang->release->bugs          = '解决的Bug';
+$lang->release->leftBugs      = '遗留的Bug';
+$lang->release->generatedBugs = '遗留的Bug';
+$lang->release->finishStories = '本次共完成 %s 个需求';
+$lang->release->resolvedBugs  = '本次共解决 %s 个Bug';
+$lang->release->createdBugs   = '本次共遗留 %s 个Bug';
+$lang->release->export        = '导出HTML';
+$lang->release->yesterday     = '昨日发布';
 
 $lang->release->filePath = '下载地址：';
 $lang->release->scmPath  = '版本库地址：';
diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php
index b0ccc99b56..2f56ce571a 100644
--- a/module/release/view/linkbug.html.php
+++ b/module/release/view/linkbug.html.php
@@ -24,16 +24,18 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
       <thead>
         <tr>
           <th class='c-id'>
+            <?php if($allBugs):?>
             <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
+            <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
           <th class='w-pri'><?php echo $lang->priAB;?></th>
           <th>              <?php echo $lang->bug->title;?></th>
-          <th class='w-user text-left'>  <?php echo $lang->openedByAB;?></th>
-          <th class='w-user'> <?php echo $lang->bug->resolvedBy;?></th>
-          <th class='w-80px'>  <?php echo $lang->statusAB;?></th>
+          <th class='w-user text-left'><?php echo $lang->openedByAB;?></th>
+          <th class='w-user'><?php echo $lang->bug->resolvedBy;?></th>
+          <th class='w-80px'><?php echo $lang->statusAB;?></th>
         </tr>
       </thead>
       <tbody>
@@ -42,11 +44,7 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
         <?php if(strpos(",{$releaseBugs},", ",$bug->id,") !== false) continue;?>
         <tr>
           <td class='c-id'>
-            <div class="checkbox-primary">
-              <input type='checkbox' name='bugs[<?php echo $bug->id?>]'  value='<?php echo $bug->id;?>' <?php if($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?> /> 
-              <label></label>
-            </div>
-            <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?>
+            <?php echo html::checkbox('bugs', array($bug->id => sprintf('%03d', $bug->id)), ($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') ? $bud->id : '');?>
           </td>
           <td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
           <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
@@ -58,15 +56,15 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
         <?php endforeach;?>
       </tbody>
     </table>
-    <?php if($unlinkedCount):?>
     <div class='table-footer'>
+      <?php if($unlinkedCount):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="btn-toolbar">
         <?php echo html::submitButton($lang->release->linkBug);?>
-        <?php echo html::a(inlink('view', "releaseID=$release->id&type=$type"), $lang->goback, '', "class='btn'");?>
       </div>
+      <?php endif;?>
+      <?php echo html::a(inlink('view', "releaseID=$release->id&type=$type"), $lang->goback, '', "class='btn'");?>
     </div>
-    <?php endif;?>
   </form>
 </div>
 <script>
@@ -74,6 +72,5 @@ $(function()
 {
     ajaxGetSearchForm('#<?php echo $type == 'bug' ? 'bugs' : 'leftBugs'?> .linkBox #queryBox')
     setModal();
-    $('[data-ride="table"]').table();
 })
 </script>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index a71a672ca3..007604a022 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -20,9 +20,11 @@
       <thead>
         <tr>
           <th class='c-id'>
+            <?php if($allStories):?>
             <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
+            <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
           <th class='w-pri'><?php echo $lang->priAB;?></th>
@@ -59,17 +61,15 @@
         <?php endforeach;?>
       </tbody>
     </table>
-    <?php if($unlinkedCount):?>
     <div class='table-footer'>
+      <?php if($unlinkedCount):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class='btn-toolbar'>
-        <?php
-        echo html::selectButton() . html::submitButton($lang->story->linkStory);
-        echo html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'");
-        ?>
+        <?php echo html::submitButton($lang->release->linkStory);?>
       </div>
+      <?php endif;?>
+      <?php echo html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'");?>
     </div>
-    <?php endif;?>
   </form>
 </div>
 <script>
@@ -77,6 +77,5 @@ $(function()
 {
     ajaxGetSearchForm('#stories .linkBox #queryBox');
     setModal();
-    $('[data-ride="table"]').table();
 })
 </script>