From 24a5917b4a60d471c6fce67dd168b668b4d84ece Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 5 Aug 2022 10:08:28 +0800
Subject: [PATCH] * Fix issue #714.

---
 module/my/view/testcase.html.php       | 18 +++++-------------
 module/testtask/control.php            |  1 +
 module/testtask/js/batchrun.js         |  8 ++++++++
 module/testtask/view/batchrun.html.php |  3 ++-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index bc463f0dfb..73b4a4e898 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -43,14 +43,12 @@
       <?php
       $vars = "mode=$mode&type=$type&param=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
       $this->app->loadLang('testtask');
-      $canBatchRun    = (common::hasPriv('testtask', 'batchRun')  and $type == 'assigntome');
-      $canBatchEdit   = (common::hasPriv('testcase', 'batchEdit') and $type == 'assigntome');
-      $canBatchAction = ($canBatchRun or $canBatchEdit);
+      $canBatchEdit = (common::hasPriv('testcase', 'batchEdit') and $type == 'assigntome');
       ?>
       <thead>
         <tr>
-        <th class="<?php echo $canBatchAction ? 'w-100px' : 'w-50px';?>">
-            <?php if($canBatchAction):?>
+        <th class="<?php echo $canBatchEdit ? 'w-100px' : 'w-50px';?>">
+            <?php if($canBatchEdit):?>
             <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
@@ -80,7 +78,7 @@
         ?>
         <tr>
           <td class="c-id">
-            <?php if($canBatchAction):?>
+            <?php if($canBatchEdit):?>
             <div class="checkbox-primary">
               <input type='checkbox' name='caseIDList[]' value='<?php echo $case->id;?>' <?php if(!$canBeChanged) echo 'disabled';?> />
               <label></label>
@@ -120,7 +118,7 @@
       </tbody>
     </table>
     <div class="table-footer">
-      <?php if($canBatchAction):?>
+      <?php if($canBatchEdit):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <?php endif;?>
       <div class="table-actions btn-toolbar">
@@ -131,12 +129,6 @@
             $misc       = "data-form-action='$actionLink'";
             echo html::commonButton($lang->edit, $misc);
         }
-        if($canBatchRun)
-        {
-            $actionLink = $this->createLink('testtask', 'batchRun', 'productID=0');
-            $misc       = "data-form-action='$actionLink'";
-            echo html::commonButton($lang->testtask->runCase, $misc);
-        }
         ?>
       </div>
       <?php $pager->show('right', 'pagerjs');?>
diff --git a/module/testtask/control.php b/module/testtask/control.php
index fa04dad445..053120b107 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1377,6 +1377,7 @@ class testtask extends control
         $this->view->title      = $this->lang->testtask->batchRun;
         $this->view->position[] = $this->lang->testtask->common;
         $this->view->position[] = $this->lang->testtask->batchRun;
+        $this->view->from       = $from;
         $this->display();
     }
 
diff --git a/module/testtask/js/batchrun.js b/module/testtask/js/batchrun.js
index 4554de1f19..812b4bdabc 100644
--- a/module/testtask/js/batchrun.js
+++ b/module/testtask/js/batchrun.js
@@ -1,3 +1,11 @@
+$(function(){
+    if(from == 'testcase')
+    {
+        $("#navbar li[data-id='testtask']").toggleClass('active');
+        $("#navbar li[data-id='testcase']").toggleClass('active');
+    }
+});
+
 $(document).on('keyup', 'form input:text', function()
 {
     var preSelect = $(this).parent().prev().find('select');
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index 48eed57c00..fb8aa70398 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -11,10 +11,11 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php js::set('from', $from);?>
 <?php $this->app->loadLang('testcase'); unset($this->lang->testcase->resultList['n/a']); ?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
-    <h2><?php echo $lang->testtask->common . $lang->colon . $lang->testtask->batchRun;?></h2>
+    <h2><?php echo ($from == 'testtask' ? ($lang->testtask->common . $lang->colon) : ''). $lang->testtask->batchRun;?></h2>
   </div>
   <form class='main-form' method='post' target='hiddenwin'>
     <table class='table table-fixed table-form table-bordered'>