diff --git a/module/admin/model.php b/module/admin/model.php index 6c0efa2c1e..268bbbe209 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -301,13 +301,14 @@ class adminModel extends model } /** + * 获取有权限的链接。 * Get the authorized link. * * @param array $menu * @access public * @return array */ - public function getHasPrivLink($menu) + public function getHasPrivLink(array $menu): array { $link = array(); if(!empty($menu['link'])) diff --git a/module/admin/test/admin.class.php b/module/admin/test/admin.class.php index c33f836352..4e4828675a 100644 --- a/module/admin/test/admin.class.php +++ b/module/admin/test/admin.class.php @@ -62,18 +62,18 @@ class adminTest } /** - * Get the authorized link + * 测试获取有权限的链接。 + * Test get the authorized link. * - * @param mixed $menuKey + * @param string $menuKey * @access public * @return array */ - public function getHasPrivLinkTest($menuKey) + public function getHasPrivLinkTest(string $menuKey): array { global $lang; - $subMenuList = $lang->admin->menuList->$menuKey['subMenu']; - $link = array(); - foreach($subMenuList as $subMenu) + $link = array(); + foreach($lang->admin->menuList->$menuKey['subMenu'] as $subMenu) { $link = $this->objectModel->getHasPrivLink($subMenu); if(!empty($link)) return $link; diff --git a/module/admin/test/model/gethasprivlink.php b/module/admin/test/model/gethasprivlink.php index a5bfbb8a2f..2dfc2a21b5 100644 --- a/module/admin/test/model/gethasprivlink.php +++ b/module/admin/test/model/gethasprivlink.php @@ -1,27 +1,22 @@ #!/usr/bin/env php getHasPrivLink(); cid=1 pid=1 -获取功能配置第一个有权限访问的链接 >> custom,mode -获取人员管理第一个有权限访问的链接 >> dept,browse -获取模型配置第一个有权限访问的链接 >> custom,required -获取功能配置第一个有权限访问的链接 >> custom,set -获取通知设置第一个有权限访问的链接 >> mail,edit -获取二次开发第一个有权限访问的链接 >> dev,api - */ -$adminTester = new adminTest(); +include dirname(__FILE__, 5) . '/test/lib/init.php'; +include dirname(__FILE__, 2) . '/admin.class.php'; +zdTable('user')->gen(5); +su('admin'); + +$adminTester = new adminTest(); $subMenu['system'] = $lang->admin->menuList->system['subMenu']; -$menuList = array('system', 'user', 'model', 'feature', 'message', 'dev'); +$menuList = array('system', 'company', 'model', 'feature', 'message', 'dev'); + r($adminTester->getHasPrivLinkTest($menuList[0])) && p('0,1') && e('custom,mode'); // 获取功能配置第一个有权限访问的链接 r($adminTester->getHasPrivLinkTest($menuList[1])) && p('0,1') && e('dept,browse'); // 获取人员管理第一个有权限访问的链接 r($adminTester->getHasPrivLinkTest($menuList[2])) && p('0,1') && e('custom,required'); // 获取模型配置第一个有权限访问的链接