From 1364cd2f91249056875dbf70badae68faa0d27f9 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 30 Jul 2019 10:50:41 +0800 Subject: [PATCH] * finish task #6140. --- module/project/model.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index 1355218068..afc9f6bd45 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -127,12 +127,10 @@ class projectModel extends model foreach($subMenu as $menuKey => $menu) { $itemMenu = zget($projectSubMenu, $menuKey, ''); - if(($moduleName == strtolower($menu->link['module']) and - ( - $methodName == strtolower($menu->link['method']) or - (is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false) - )) or (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false) - ) + $isActive['method'] = ($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method'])); + $isActive['alias'] = ($moduleName == strtolower($menu->link['module']) and (is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false)); + $isActive['subModule'] = (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false); + if($isActive['method'] or $isActive['alias'] or $isActive['subModule']) { $this->lang->project->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link); break;