From c71d3d15405f16ecfe7e2b4d3ad609a2a2ccfdda Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 15 Aug 2018 10:23:31 +0800
Subject: [PATCH]  * fix bug for modal in testcase browse page.

---
 module/bug/view/browse.html.php      | 27 ++++++++++++++++-----------
 module/testcase/view/browse.html.php | 13 +++++++++----
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 1b66db7390..30973a3ccb 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -11,6 +11,13 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php if($config->global->flow == 'onlyTest'):?>
+<style>
+.nav > li > .btn-group > a, .nav > li > .btn-group > a:hover, .nav > li > .btn-group > a:focus{background: #1a4f85; border-color: #164270;}
+.outer.with-side #featurebar {background: none; border: none; line-height: 0; margin: 0; min-height: 0; padding: 0; }
+#querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;}
+</style>
+<?php endif;?>
 <?php
 include '../../common/view/datatable.fix.html.php';
 js::set('browseType',    $browseType);
@@ -172,14 +179,16 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
       </p>
     </div>
     <?php else:?>
-    <form class='main-table table-bug' data-ride='table' method='post' id='bugForm'>
+    <?php
+    $datatableId  = $this->moduleName . ucfirst($this->methodName);
+    $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
+    ?>
+    <form class='main-table table-bug' method='post' id='bugForm' <?php if(!$useDatatable) echo "data-ride='table'";?>>
       <div class="table-header fixed-right">
         <nav class="btn-toolbar pull-right"></nav>
       </div>
       <?php
-      $datatableId  = $this->moduleName . ucfirst($this->methodName);
-      $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
-      $vars         = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+      $vars = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
       if($useDatatable) include '../../common/view/datatable.html.php';
 
       $setting = $this->datatable->getSetting('bug');
@@ -369,16 +378,12 @@ $('#module' + moduleID).closest('li').addClass('active');
 <?php if($browseType == 'bysearch'):?>
 if($('#query li.active').size() == 0) $.toggleQueryBox(true);
 <?php endif;?>
+<?php if($useDatatable):?>
+$(function(){$('#bugForm').table();})
+<?php endif;?>
 <?php $this->app->loadConfig('qa', '', false);?>
 <?php if(isset($config->qa->homepage) and $config->qa->homepage != 'browse' and $config->global->flow == 'full'):?>
 $(function(){$('#modulemenu .nav li:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"qa\", \"browse\")'><i class='icon icon-cog'></i> <?php echo $lang->homepage?></a></li>")});
 <?php endif;?>
 </script>
-<?php if($config->global->flow == 'onlyTest'):?>
-<style>
-.nav > li > .btn-group > a, .nav > li > .btn-group > a:hover, .nav > li > .btn-group > a:focus{background: #1a4f85; border-color: #164270;}
-.outer.with-side #featurebar {background: none; border: none; line-height: 0; margin: 0; min-height: 0; padding: 0; }
-#querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;}
-</style>
-<?php endif;?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 6072ee8ce0..075d4f3d96 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -54,14 +54,16 @@ js::set('suiteID',        $suiteID);
       </p>
     </div>
     <?php else:?>
-    <form class='main-table table-case' id='batchForm' method='post' data-ride='table'>
+    <?php
+    $datatableId  = $this->moduleName . ucfirst($this->methodName);
+    $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
+    ?>
+    <form class='main-table table-case' id='caseForm' method='post' <?php if(!$useDatatable) echo "data-ride='table'";?>>
       <div class="table-header fixed-right">
         <nav class="btn-toolbar pull-right"></nav>
       </div>
       <?php
-      $datatableId  = $this->moduleName . ucfirst($this->methodName);
-      $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
-      $vars         = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+      $vars = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
   
       if($useDatatable)  include '../../common/view/datatable.html.php';
       else               include '../../common/view/tablesorter.html.php';
@@ -217,5 +219,8 @@ js::set('suiteID',        $suiteID);
 <script>
 $('#module' + moduleID).closest('li').addClass('active'); 
 $('#' + caseBrowseType + 'Tab').addClass('btn-active-text').find('.text').after(" <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
+<?php if($useDatatable):?>
+$(function(){$('#caseForm').table();})
+<?php endif;?>
 </script>
 <?php include '../../common/view/footer.html.php';?>