From 03d986bd85d49b1dba1977979b6f45c5028d1f7a Mon Sep 17 00:00:00 2001
From: zhujinyong <vimrus.com@gmail.com>
Date: Mon, 22 Mar 2021 18:10:03 +0800
Subject: [PATCH] * Fix menu.

---
 module/common/model.php    | 2 +-
 module/product/control.php | 4 ----
 module/story/control.php   | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 0f70729e32..75d4cdab0b 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -831,7 +831,7 @@ class commonModel extends model
             $class     = isset($menuItem->class) ? $menuItem->class : '';
             $active    = '';
             if($subModule and in_array($currentModule, $subModule)) $active = 'active';
-            if($alias and $moduleName == $currentModule and strpos(",$alias,", ",$currentMethod,") !== false) $active = 'active';
+            // if($alias and $moduleName == $currentModule and strpos(",$alias,", ",$currentMethod,") !== false) $active = 'active';
             if($menuItem->link)
             {
                 $target = '';
diff --git a/module/product/control.php b/module/product/control.php
index 82732f207b..865e7be3b5 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -987,10 +987,6 @@ class product extends control
         {
             $this->app->loadLang($fromModule);
 
-            $projectModel = $this->loadModel('project')->getByID($this->session->project);
-            $this->lang->product->menu      = $this->lang->menu->{$projectModel->model};
-            $this->lang->product->menuOrder = $this->lang->{$projectModel->model}->menuOrder;
-
             /* The secondary test menu processing in the project. */
             if(in_array($fromModule, array('qa', 'bug', 'testtask', 'testreport')))
             {
diff --git a/module/story/control.php b/module/story/control.php
index c284afe3cc..136aa51fbe 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1463,8 +1463,6 @@ class story extends control
             foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
         }
 
-        $this->lang->story->menu      = $this->lang->qa->subMenu->testcase;
-        $this->lang->story->menuOrder = $this->lang->testcase->menuOrder;
         $this->loadModel('testcase')->setMenu($products, $productID);
 
         /* Append id for secend sort. */