From 0524f889228fa45fdd6bbcdb72cf115a3807e997 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 22 Mar 2021 10:03:14 +0800
Subject: [PATCH] * Fix code error.

---
 module/common/lang/menu.php        |  7 +++++++
 module/common/model.php            | 16 ----------------
 module/common/view/header.html.php |  2 +-
 module/custom/model.php            |  5 +++--
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index bda0f0167d..bf57c15308 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -63,6 +63,13 @@ $lang->my->menu->work['subMenu']->bug      = "{$lang->bug->common}|my|work|mode=
 $lang->my->menu->work['subMenu']->testcase = "{$lang->testcase->common}|my|work|mode=testcase&type=assigntome";
 $lang->my->menu->work['subMenu']->testtask = "{$lang->testtask->common}|my|work|mode=testtask&type=wait";
 
+$lang->my->menu->work['menuOrder'][5]  = 'task';
+$lang->my->menu->work['menuOrder'][10] = 'requirement';
+$lang->my->menu->work['menuOrder'][15] = 'story';
+$lang->my->menu->work['menuOrder'][20] = 'bug';
+$lang->my->menu->work['menuOrder'][25] = 'testcase';
+$lang->my->menu->work['menuOrder'][30] = 'testtask';
+
 $lang->my->menu->contribute['subMenu'] = new stdclass();
 $lang->my->menu->contribute['subMenu']->task     = "{$lang->task->common}|my|contribute|mode=task";
 if($config->URAndSR) $lang->my->menu->contribute['subMenu']->requirement = "$lang->URCommon|my|contribute|mode=requirement";
diff --git a/module/common/model.php b/module/common/model.php
index f40446bb68..58cf21348f 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -789,8 +789,6 @@ class commonModel extends model
 
         $openApp = $app->openApp;
 
-        self::getModuleMenu($activeMenu);
-
         if(!isset($lang->$openApp->menu))
         {
             echo "<ul></ul>";
@@ -2355,20 +2353,6 @@ EOD;
         }
     }
 
-    /**
-     * Get my module menu by methodName.
-     *
-     * @param  string $activeMenu
-     * @static
-     * @access public
-     * @return void
-     */
-    public static function getModuleMenu($activeMenu)
-    {
-        global $app, $lang;
-        $lang->{$app->openApp}->menu = $lang->{$app->openApp}->menu->$activeMenu['subMenu'];
-    }
-
     /**
      * Get relations for two object.
      *
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 1a24c87d1a..23b937bebc 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -14,7 +14,7 @@ include 'chosen.html.php';
       <nav id='navbar'><?php $activeMenu = commonModel::printMainMenu();?></nav>
     </div>
   </div>
-  <?php if(isset($lang->{$app->openApp}->menu->$activeMenu) and isset($lang->{$app->openApp}->menu->$activeMenu['subMenu'])):?>
+  <?php if(isset($lang->{$app->openApp}->menu->$activeMenu) and isset($lang->{$app->openApp}->menu->{$activeMenu}['subMenu'])):?>
   <div id='subHeader'>
     <div class='container'>
       <div id="pageNav" class='btn-toolbar'><?php if(isset($lang->modulePageNav)) echo $lang->modulePageNav;?></div>
diff --git a/module/custom/model.php b/module/custom/model.php
index 06c3ec70f8..7362705d26 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -195,7 +195,7 @@ class customModel extends model
         }
         elseif($module)
         {
-            $menuOrder = ($module == 'main' and isset($lang->menuOrder)) ? $lang->menuOrder : (isset($lang->menu->$module['menuOrder']) ? $lang->menu->$module['menuOrder'] : array());
+            $menuOrder = ($module == 'main' and isset($lang->menuOrder)) ? $lang->menuOrder : (isset($lang->menu->{$module}['menuOrder']) ? $lang->menu->{$module}['menuOrder'] : array());
             if($menuOrder)
             {
                 ksort($menuOrder);
@@ -321,7 +321,8 @@ class customModel extends model
         if(empty($module)) $module = 'main';
 
         global $app, $lang, $config;
-        $allMenu = $module == 'main' ? $lang->menu : $lang->menu->$module['subMenu'];
+        if($module == 'main') $allMenu = $lang->menu;
+        if($module != 'main' and isset($lang->menu->$module) and isset($lang->menu->{$module}['subMenu'])) $allMenu = $lang->menu->{$module}['subMenu'];
         if($module == 'product' and isset($allMenu->branch)) $allMenu->branch = str_replace('@branch@', $lang->custom->branch, $allMenu->branch);
         $flowModule = $config->global->flow . '_' . $module;
         $customMenu = isset($config->customMenu->$flowModule) ? $config->customMenu->$flowModule : array();