From 2ee4afbe18f095826a483078338f6f96e872d06b Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 29 Dec 2020 10:57:53 +0800
Subject: [PATCH] * Fix menu.

---
 module/common/lang/menuOrder.php |  9 +++++++++
 module/common/lang/zh-cn.php     |  2 +-
 module/common/model.php          | 10 +++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index f71fbebbf8..0724e2e605 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -1,4 +1,13 @@
 <?php
+$lang->mainNav->menuOrder[5]  = 'my';
+$lang->mainNav->menuOrder[10] = 'program';
+$lang->mainNav->menuOrder[15] = 'product';
+$lang->mainNav->menuOrder[20] = 'project';
+$lang->mainNav->menuOrder[25] = 'repo';
+$lang->mainNav->menuOrder[30] = 'doc';
+$lang->mainNav->menuOrder[60] = 'system';
+$lang->mainNav->menuOrder[70] = 'admin';
+
 /* Sort of main menu. */
 $lang->waterfall->menuOrder[5]  = 'programindex';
 $lang->waterfall->menuOrder[10] = 'programplan';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index ac13f8a829..faef785c05 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -139,7 +139,7 @@ $lang->mainNav->system  = '<i class="icon icon-group"></i> 组织|subject|browse
 $lang->mainNav->admin   = '<i class="icon icon-cog-outline"></i> 后台|admin|index|';
 
 $lang->reporting = new stdclass();
-$lang->dividerMenu = ',admin,project,doc,';
+$lang->dividerMenu = ',project,doc,';
 
 /* Program set menu. */
 $lang->program = new stdclass();
diff --git a/module/common/model.php b/module/common/model.php
index e13663611c..77b1ff474b 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -562,10 +562,14 @@ class commonModel extends model
     {
         global $lang;
 
+        $menuOrder = $lang->mainNav->menuOrder;
+        ksort($menuOrder);
+
         $items = array();
-        $lastNavItem = end($lang->mainNav);
-        foreach($lang->mainNav as $group => $nav)
+        $lastItem = end($menuOrder);
+        foreach($menuOrder as $key => $group)
         {
+            $nav = $lang->mainNav->$group;
             list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
 
             if(!common::hasPriv($currentModule, $currentMethod)) continue;
@@ -581,7 +585,7 @@ class commonModel extends model
 
             $items[] = $item;
 
-            if(($lastNavItem != $nav) && strpos($lang->dividerMenu, ",{$group},") !== false)
+            if(($lastItem != $key) && strpos($lang->dividerMenu, ",{$group},") !== false)
             {
                 $items[] = 'divider';
             }