From 4b45d79941568ef3df0bf179fa7be441faa42273 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 22 Mar 2021 10:28:59 +0800
Subject: [PATCH]  * Adjust my work and contribute menu.

---
 module/bug/control.php      | 4 ++--
 module/bug/js/batchedit.js  | 9 +++++++--
 module/doc/control.php      | 4 ++--
 module/task/control.php     | 4 ++--
 module/testcase/control.php | 4 ++--
 module/testtask/control.php | 4 ++--
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 86eecab27e..e037c2b4d5 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -912,8 +912,8 @@ class bug extends control
             $this->loadModel('my')->setMenu();
             $moduleIndex = array_search('bug', $this->lang->noMenuModule);
             if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-            $this->lang->task->menu = $this->lang->my->workMenu;
-            $this->lang->my->menu->myWork['subModule'] = 'bug';
+            $this->lang->task->menu = $this->lang->my->menu->work;
+            $this->lang->my->menu->work['subModule'] = 'bug';
 
             $this->view->position[] = html::a($this->createLink('my', 'bug'), $this->lang->my->bug);
             $this->view->title      = "BUG" . $this->lang->bug->batchEdit;
diff --git a/module/bug/js/batchedit.js b/module/bug/js/batchedit.js
index 5d2884a08d..26a3876963 100644
--- a/module/bug/js/batchedit.js
+++ b/module/bug/js/batchedit.js
@@ -1,7 +1,7 @@
 /**
  * Set duplicate field.
- * 
- * @param  string $resolution 
+ *
+ * @param  string $resolution
  * @access public
  * @return void
  */
@@ -68,3 +68,8 @@ $(document).on('change', 'select', function()
         $(this).trigger("change");
     }
 })
+
+$(function()
+{
+    $('#subNavbar li[data-id="bug"]').addClass('active');
+});
diff --git a/module/doc/control.php b/module/doc/control.php
index 8e85269f77..7147df9c9c 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -451,7 +451,7 @@ class doc extends control
         /* Set my menu. */
         if($this->app->openApp == 'my')
         {
-            $this->lang->doc->menu     = $this->lang->my->contributeMenu;
+            $this->lang->doc->menu     = $this->lang->my->menu->contribute;
             $this->lang->modulePageNav = '';
             $this->lang->TRActions     = '';
             $this->lang->my->menu->contribute['subModule'] = 'doc';
@@ -932,7 +932,7 @@ class doc extends control
             $productID   = $type == 'product'   ? $objectID : 0;
             $executionID = $type == 'execution' ? $objectID : 0;
             $this->doc->setMenu($type, 0, 0, $productID, $executionID, $crumb);
-            
+
         }
         elseif($from == 'execution')
         {
diff --git a/module/task/control.php b/module/task/control.php
index 6f3b5fd129..f87ede1663 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -478,8 +478,8 @@ class task extends control
             $this->loadModel('my')->setMenu();
             $moduleIndex = array_search('task', $this->lang->noMenuModule);
             if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
-            $this->lang->task->menu = $this->lang->my->workMenu;
-            $this->lang->my->menu->myWork['subModule'] = 'task';
+            $this->lang->task->menu = $this->lang->my->menu->work;
+            $this->lang->my->menu->work['subModule'] = 'task';
 
             $this->view->position[] = html::a($this->createLink('my', 'task'), $this->lang->my->task);
             $this->view->title      = $this->lang->task->batchEdit;
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 10b2747ed2..ea5d8b20c8 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -810,8 +810,8 @@ class testcase extends control
 
             /* The cases of my. */
             $this->loadModel('my')->setMenu();
-            $this->lang->testcase->menu = $this->lang->my->workMenu;
-            $this->lang->my->menu->myWork['subModule'] = 'testcase';
+            $this->lang->testcase->menu = $this->lang->my->menu->work;
+            $this->lang->my->menu->work['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/testtask/control.php b/module/testtask/control.php
index 398b3fceec..cc80de34a7 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1094,8 +1094,8 @@ class testtask extends control
         /* The case of my. */
         else
         {
-            $this->lang->testtask->menu = $this->lang->my->workMenu;
-            $this->lang->my->menu->myWork['subModule'] = 'testtask';
+            $this->lang->testtask->menu = $this->lang->my->menu->work;
+            $this->lang->my->menu->work['subModule'] = 'testtask';
 
             $this->view->title = $this->lang->testtask->batchRun;