diff --git a/module/dev/model.php b/module/dev/model.php index 6e561cae63..9e1b065031 100644 --- a/module/dev/model.php +++ b/module/dev/model.php @@ -666,7 +666,7 @@ class devModel extends model public function getTagMenus($module, $moduleName = '', $methodName = '') { $menus = array(); - if($this->config->vision == 'lite' and $module == 'execution') return $menus; + if(!$module or ($this->config->vision == 'lite' and $module == 'execution')) return $menus; $titleList = array(); $tagMethods = array(); diff --git a/test/model/dev/sortmenus.php b/test/model/dev/sortmenus.php index 56f82f37ea..65c083ecc9 100644 --- a/test/model/dev/sortmenus.php +++ b/test/model/dev/sortmenus.php @@ -13,14 +13,14 @@ cid=1 pid=1 检查传入空值时的情况 >> 0 -检查传入地盘导航顺序 >> index,calendar,work,audit,project,execution,contribute,dynamic,score,contacts, +检查传入产品导航顺序 >> dashboard,story,plan,project,release,roadmap,track,doc,dynamic,settings, */ global $tester; $menuList[0] = array(); -$menuList[1] = $tester->lang->my->menu; +$menuList[1] = $tester->lang->product->menu; $devTester = new devTest(); r($devTester->sortMenusTest($menuList[0])) && p() && e('0'); // 检查传入空值时的情况 -r($devTester->sortMenusTest($menuList[1])) && p() && e('index,calendar,work,audit,project,execution,contribute,dynamic,score,contacts,'); // 检查传入地盘导航顺序 +r($devTester->sortMenusTest($menuList[1])) && p() && e('dashboard,story,plan,project,release,roadmap,track,doc,dynamic,settings,'); // 检查传入产品导航顺序