From b5234d6869dd92f959c5e7df8f2eeabd5f2e67db Mon Sep 17 00:00:00 2001
From: qiyu-xie <xieqiyu@easycorp.ltd>
Date: Tue, 17 Aug 2021 17:29:26 +0800
Subject: [PATCH] * Adjust code style at review.

---
 module/common/model.php | 52 ++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 36719d746d..5708bbaac7 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -567,9 +567,10 @@ class commonModel extends model
         $menuOrder = $lang->mainNav->menuOrder;
         ksort($menuOrder);
 
-        $items = array();
+        $items    = array();
         $lastItem = end($menuOrder);
-        $divider = false;
+        $divider  = false;
+
         foreach($menuOrder as $key => $group)
         {
             $nav = $lang->mainNav->$group;
@@ -577,32 +578,39 @@ class commonModel extends model
 
             /* 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))
-            {
-                $hidden = true;
-                if($currentModule == 'assetlib')
-                {
-                    $methodList = array('caselib', 'issuelib', 'risklib', 'opportunitylib', 'practicelib', 'componentlib');
-                    foreach($methodList as $method)
-                    {
-                        if(common::hasPriv($currentModule, $method))
-                        {
-                            $hidden        = false;
-                            $currentMethod = $method;
-                            break;
-                        }
-                    }
-                }
-                if($hidden) continue;
-            }
-
             if($divider and !empty($items))
             {
                 $items[] = 'divider';
                 $divider = false;
             }
 
+            /**
+             * Judget the module display or not.
+             *
+             */
+            $display = false;
+
+            /* 1. The default rule. */
+            if(common::hasPriv($currentModule, $currentMethod)) $display = true;
+
+            /* 2. If the module is assetLib, need judge more methods. */
+            if($currentModule == 'assetlib' and $display == false)
+            {
+                $methodList = array('caselib', 'issuelib', 'risklib', 'opportunitylib', 'practicelib', 'componentlib');
+                foreach($methodList as $method)
+                {
+                    if(common::hasPriv($currentModule, $method))
+                    {
+                        $display       = true;
+                        $currentMethod = $method;
+                        break;
+                    }
+                }
+            }
+
+            if(!$display) continue;
+
+            /* Assign vars. */
             $item = new stdClass();
             $item->group      = $group;
             $item->code       = $group;