From 6077c2ea7f024e44f2b012eceab19d03d345e336 Mon Sep 17 00:00:00 2001
From: zhujinyong <vimrus.com@gmail.com>
Date: Mon, 12 Apr 2021 22:15:45 +0800
Subject: [PATCH] * Fix mainNav divider.

---
 module/common/lang/menu.php |  2 +-
 module/common/model.php     | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 93b651e7c2..265bf2cb4e 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -40,7 +40,7 @@ $lang->mainNav->report    = "{$lang->navIcons['report']} {$lang->report->common}
 $lang->mainNav->system    = "{$lang->navIcons['system']} {$lang->system->common}|my|team|";
 $lang->mainNav->admin     = "{$lang->navIcons['admin']} {$lang->admin->common}|admin|index|";
 
-$lang->dividerMenu = ',devops,system,';
+$lang->dividerMenu = ',doc,admin,';
 $lang->mainNav->menuOrder[5]  = 'my';
 if($config->systemMode == 'new') $lang->mainNav->menuOrder[10] = 'program';
 $lang->mainNav->menuOrder[15] = 'product';
diff --git a/module/common/model.php b/module/common/model.php
index c5f7c6a64c..6eafb142d7 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -577,13 +577,23 @@ class commonModel extends model
 
         $items = array();
         $lastItem = end($menuOrder);
+        $divider = false;
         foreach($menuOrder as $key => $group)
         {
             $nav = $lang->mainNav->$group;
             list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
 
+            /* When last divider is not used in mainNav, use it next menu. */
+            $divider = ($divider || ($lastItem != $key) && strpos($lang->dividerMenu, ",{$group},") !== false) ? true : false;
+
             if(!common::hasPriv($currentModule, $currentMethod)) continue;
 
+            if($divider)
+            {
+                $items[] = 'divider';
+                $divider = false;
+            }
+
             $item = new stdClass();
             $item->group      = $group;
             $item->code       = $group;
@@ -595,11 +605,6 @@ class commonModel extends model
             $item->url        = helper::createLink($currentModule, $currentMethod, $vars, '', 0, 0, 1);
 
             $items[] = $item;
-
-            if(($lastItem != $key) && strpos($lang->dividerMenu, ",{$group},") !== false)
-            {
-                $items[] = 'divider';
-            }
         }
         return $items;
     }