From 911d7de31ac0c577235892a8e0a00acece1d9cbb Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 2 Feb 2023 10:52:25 +0800
Subject: [PATCH]  * adjust for admin unit testing.

---
 module/admin/lang/menu.php      | 16 +++-----
 module/admin/model.php          |  8 ++--
 module/custom/view/set.html.php |  3 ++
 test/class/admin.class.php      | 14 +++++--
 test/model/admin/getmenukey.php | 72 +++++++++++++++++++++++++++++++++
 5 files changed, 95 insertions(+), 18 deletions(-)
 create mode 100644 test/model/admin/getmenukey.php

diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 1ddd50ad48..3d069bdced 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -80,6 +80,7 @@ $lang->admin->menuList->model['subMenu']['scrum']     = array('link' => "{$lang-
 $lang->admin->menuList->model['subMenu']['waterfall'] = array('link' => "{$lang->waterfallModel}|stage|settype|", 'subModule' => 'stage');
 
 $lang->admin->menuList->model['menuOrder']['5']  = 'common';
+$lang->admin->menuList->model['menuOrder']['10'] = 'scrum';
 $lang->admin->menuList->model['menuOrder']['15'] = 'waterfall';
 
 $lang->admin->menuList->feature['subMenu']['my']          = array('link' => "{$lang->my->common}|custom|set|module=todo");
@@ -102,12 +103,12 @@ $lang->admin->menuList->feature['dividerMenu'] = ',user,';
 
 $lang->admin->menuList->message['subMenu']['mail']    = array('link' => "{$lang->mail->common}|mail|edit|", 'subModule' => 'mail');
 $lang->admin->menuList->message['subMenu']['webhook'] = array('link' => "Webhook|webhook|browse|", 'subModule' => 'webhook');
-$lang->admin->menuList->message['subMenu']['message'] = array('link' => "{$lang->browser}|message|browser|");
+$lang->admin->menuList->message['subMenu']['browser'] = array('link' => "{$lang->browser}|message|browser|");
 $lang->admin->menuList->message['subMenu']['setting'] = array('link' => "{$lang->settings}|message|setting|");
 
 $lang->admin->menuList->message['menuOrder']['5']  = 'mail';
 $lang->admin->menuList->message['menuOrder']['10'] = 'webhook';
-$lang->admin->menuList->message['menuOrder']['20'] = 'message';
+$lang->admin->menuList->message['menuOrder']['20'] = 'browser';
 $lang->admin->menuList->message['menuOrder']['25'] = 'setting';
 
 $lang->admin->menuList->dev['subMenu']['api']    = array('link' => "API|dev|api|");
@@ -120,7 +121,7 @@ $lang->admin->menuList->dev['menuOrder']['10'] = 'db';
 $lang->admin->menuList->dev['menuOrder']['15'] = 'editor';
 $lang->admin->menuList->dev['menuOrder']['20'] = 'entry';
 
-if($config->edition != 'max') unset($lang->admin->menuList->model['subMenu']['scrum']);
+if($config->edition != 'max') unset($lang->admin->menuList->model['subMenu']['scrum'], $lang->admin->menuList->model['menuOrder']['10']);
 if(!helper::hasFeature('waterfall'))
 {
     unset($lang->admin->menuList->model['subMenu']['waterfall']);
@@ -128,14 +129,7 @@ if(!helper::hasFeature('waterfall'))
 }
 if($config->edition == 'max' and !helper::hasFeature('scrum_auditplan'))
 {
-    if(!helper::hasFeature('scrum_process'))
-    {
-        $lang->admin->menuList->model['menuOrder']['10'] = 'scrum';
-    }
-    else
-    {
-        unset($lang->admin->menuList->model['subMenu']['scrum']);
-    }
+    if(helper::hasFeature('scrum_process')) unset($lang->admin->menuList->model['subMenu']['scrum'], $lang->admin->menuList->model['menuOrder']['10']);
 }
 
 if($config->vision == 'lite')
diff --git a/module/admin/model.php b/module/admin/model.php
index e8a2169677..dc6330e7a1 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -266,7 +266,7 @@ class adminModel extends model
         $menuKey = $this->getMenuKey();
         if(empty($menuKey)) return;
 
-        $this->lang->switcherMenu = $this->getSwitcher($menuKey);
+        $this->setSwitcher($menuKey);
         if(isset($this->lang->admin->menuList->$menuKey))
         {
             if(isset($this->lang->admin->menuList->$menuKey['subMenu']))     $this->lang->admin->menu        = $this->lang->admin->menuList->$menuKey['subMenu'];
@@ -368,13 +368,13 @@ class adminModel extends model
     }
 
     /**
-     * Get switcher.
+     * Set switcher.
      *
      * @param  string $currentMenuKey
      * @access public
      * @return string
      */
-    public function getSwitcher($currentMenuKey = 'system')
+    public function setSwitcher($currentMenuKey = 'system')
     {
         if(empty($currentMenuKey)) return null;
 
@@ -393,7 +393,7 @@ class adminModel extends model
         }
         $output .= "</ul></div>";
 
-        return $output;
+        $this->lang->switcherMenu = $output;
     }
 
     /**
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index f9b3dd1fdd..d73c05b92b 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -42,6 +42,9 @@ $('#navbar ul.nav li[data-id=<?php echo $module?>]').addClass('active');
 <?php if($module == 'todo'):?>
 $('#navbar ul.nav li[data-id=my]').addClass('active');
 <?php endif;?>
+<?php if($module == 'baseline'):?>
+$('#navbar ul.nav li[data-id=type]').addClass('active');
+<?php endif;?>
 </script>
 <?php if($module == 'story' and $field == 'review'):?>
 <style>
diff --git a/test/class/admin.class.php b/test/class/admin.class.php
index 2fb907a7f6..a46fffd462 100644
--- a/test/class/admin.class.php
+++ b/test/class/admin.class.php
@@ -38,7 +38,6 @@ class adminTest
      * @access public
      * @return void
      */
-
     public function getStatOfPMSTest()
     {
         $objects = $this->objectModel->getStatOfPMS();
@@ -134,7 +133,6 @@ class adminTest
      * @access public
      * @return string
      */
-
     public function getSignatureTest()
     {
         $params['u'] = $this->communityConfig;
@@ -185,7 +183,6 @@ class adminTest
      * @access public
      * @return bool
      */
-
     public function checkWeakTest($account)
     {
         $user = $this->user->getById($account);
@@ -195,4 +192,15 @@ class adminTest
 
         return $objects;
     }
+
+    public function getMenuKeyTest($moduleName, $methodName, $params = array())
+    {
+        global $app;
+        $app->rawModule = $moduleName;
+        $app->rawMethod = $methodName;
+        $app->rawParams = $params;
+
+        $menuKey = $this->objectModel->getMenuKey();
+        return empty($menuKey) ? 'null' : $menuKey;
+    }
 }
diff --git a/test/model/admin/getmenukey.php b/test/model/admin/getmenukey.php
new file mode 100644
index 0000000000..4f5a114819
--- /dev/null
+++ b/test/model/admin/getmenukey.php
@@ -0,0 +1,72 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/admin.class.php';
+su('admin');
+
+/**
+
+title=测试 adminModel->getMenuKey();
+cid=1
+pid=1
+
+访问后台页面          >> null
+访问备份页面          >> system
+访问定时列表页面      >> system
+访问定时创建页面      >> system
+访问部门页面          >> user
+访问编辑用户页面      >> user
+访问权限列表页面      >> user
+访问功能设置页面      >> switch
+访问项目必填项页面    >> model
+访问阶段类型页面      >> model
+访问检查对象页面      >> model
+访问自定义待办页面    >> feature
+访问自定义产品页面    >> feature
+访问自定义看板页面    >> feature
+访问模板类型页面      >> template
+访问文档模板页面      >> template
+访问文档目录页面      >> template
+访问发信配置页面      >> message
+访问Webhook页面       >> message
+访问短信页面          >> message
+访问浏览器页面        >> message
+访问信息配置页面      >> message
+访问插件页面          >> extension
+访问API页面           >> dev
+访问数据库页面        >> dev
+访问编辑器页面        >> dev
+访问应用页面          >> dev
+访问数据导入页面      >> convert
+
+*/
+$admin = new adminTest();
+
+r($admin->getMenuKeyTest('admin', 'index'))     && p() && e('null');   //访问后台页面
+r($admin->getMenuKeyTest('backup', 'index'))    && p() && e('system'); //访问备份页面
+r($admin->getMenuKeyTest('cron', 'index'))      && p() && e('system'); //访问定时列表页面
+r($admin->getMenuKeyTest('cron', 'create'))     && p() && e('system'); //访问定时创建页面
+r($admin->getMenuKeyTest('dept', 'browse'))     && p() && e('user');   //访问部门页面
+r($admin->getMenuKeyTest('user', 'edit'))       && p() && e('user');   //访问编辑用户页面
+r($admin->getMenuKeyTest('group', 'browse'))    && p() && e('user');   //访问权限列表页面
+r($admin->getMenuKeyTest('admin', 'setmodule')) && p() && e('switch'); //访问功能设置页面
+r($admin->getMenuKeyTest('custom', 'required', array('module' => 'project'))) && p() && e('model'); //访问项目必填项页面
+r($admin->getMenuKeyTest('stage', 'settype'))       && p() && e('model'); //访问阶段类型页面
+r($admin->getMenuKeyTest('auditcl', 'scrumbrowse')) && p() && e('model'); //访问检查对象页面
+r($admin->getMenuKeyTest('custom', 'set', array('module' => 'todo'))) && p() && e('feature'); //访问自定义待办页面
+r($admin->getMenuKeyTest('custom', 'product')) && p() && e('feature'); //访问自定义产品页面
+r($admin->getMenuKeyTest('custom', 'kanban'))  && p() && e('feature'); //访问自定义看板页面
+r($admin->getMenuKeyTest('custom', 'set', array('module' => 'baseline'))) && p() && e('template'); //访问模板类型页面
+r($admin->getMenuKeyTest('baseline', 'template'))   && p() && e('template');   //访问文档模板页面
+r($admin->getMenuKeyTest('baseline', 'catalog'))    && p() && e('template');   //访问文档目录页面
+r($admin->getMenuKeyTest('mail', 'detect'))         && p() && e('message');    //访问发信配置页面
+r($admin->getMenuKeyTest('webhook', 'browse'))      && p() && e('message');    //访问Webhook页面
+r($admin->getMenuKeyTest('sms', 'index'))           && p() && e('message');    //访问短信页面
+r($admin->getMenuKeyTest('message', 'browser'))     && p() && e('message');    //访问浏览器页面
+r($admin->getMenuKeyTest('message', 'setting'))     && p() && e('message');    //访问信息配置页面
+r($admin->getMenuKeyTest('extension', 'browse'))    && p() && e('extension');  //访问插件页面
+r($admin->getMenuKeyTest('dev', 'api'))             && p() && e('dev');        //访问API页面
+r($admin->getMenuKeyTest('dev', 'db'))              && p() && e('dev');        //访问数据库页面
+r($admin->getMenuKeyTest('dev', 'editor'))          && p() && e('dev');        //访问编辑器页面
+r($admin->getMenuKeyTest('entry', 'browse'))        && p() && e('dev');        //访问应用页面
+r($admin->getMenuKeyTest('convert', 'convertjira')) && p() && e('convert');    //访问数据导入页面