From dd35ed8c5ba4e4a05a85b1a04378ee2e59ba0144 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Fri, 19 Mar 2021 17:59:08 +0800
Subject: [PATCH]  * Finish task #36756.

---
 module/testcase/control.php     | 6 +++---
 module/testcase/js/batchedit.js | 1 +
 module/testtask/control.php     | 6 +++---
 module/testtask/js/batchrun.js  | 5 +++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index a679d4ba53..10b2747ed2 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -799,7 +799,6 @@ class testcase extends control
                 $this->view->title      = $product->name . $this->lang->colon . $this->lang->testcase->batchEdit;
             }
         }
-        /* The cases of my. */
         else
         {
             /* Get the edited cases. */
@@ -809,9 +808,10 @@ class testcase extends control
                 ->fetchAll('id');
             $caseIDList = array_keys($cases);
 
-            $this->lang->testcase->menu = $this->lang->my->menu;
-            $this->lang->testcase->menuOrder = $this->lang->my->menuOrder;
+            /* The cases of my. */
             $this->loadModel('my')->setMenu();
+            $this->lang->testcase->menu = $this->lang->my->workMenu;
+            $this->lang->my->menu->myWork['subModule'] = 'testcase';
 
             $this->view->position[] = html::a($this->server->http_referer, $this->lang->my->testCase);
             $this->view->title      = $this->lang->testcase->batchEdit;
diff --git a/module/testcase/js/batchedit.js b/module/testcase/js/batchedit.js
index e9747337f4..618c579d39 100644
--- a/module/testcase/js/batchedit.js
+++ b/module/testcase/js/batchedit.js
@@ -37,6 +37,7 @@ function loadBranches(product, branch, caseID)
 $(function()
 {
     removeDitto();  //Remove 'ditto' in first row.
+    $('#subNavbar li[data-id="testcase"]').addClass('active');
 });
 
 $(document).on('click', '.chosen-with-drop', function(){oldValue = $(this).prev('select').val();})//Save old value.
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 7da93ff573..7378af8139 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1095,9 +1095,9 @@ class testtask extends control
         /* The case of my. */
         else
         {
-            $this->lang->testtask->menu = $this->lang->my->menu;
-            $this->lang->testtask->menuOrder = $this->lang->my->menuOrder;
-            $this->loadModel('my')->setMenu();
+            $this->lang->testtask->menu = $this->lang->my->workMenu;
+            $this->lang->my->menu->myWork['subModule'] = 'testtask';
+
             $this->view->title = $this->lang->testtask->batchRun;
 
             $cases = $this->dao->select('t1.*,t2.id as runID')->from(TABLE_CASE)->alias('t1')
diff --git a/module/testtask/js/batchrun.js b/module/testtask/js/batchrun.js
index 4554de1f19..a6fb240b16 100644
--- a/module/testtask/js/batchrun.js
+++ b/module/testtask/js/batchrun.js
@@ -10,3 +10,8 @@ $(document).on('keyup', 'form input:text', function()
         $(preSelect).val('fail');
     }
 })
+
+$(function()
+{
+    $('#subNavbar li[data-id="testcase"]').addClass('active');
+})