Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285

Browse Source
This commit is contained in:
caoyanyi
2023-02-02 11:33:25 +08:00
parent e8f4b52e10 911d7de31a
commit b9b1906c61
5 changed files with 95 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/lang/menu.php
+5 -11
View File
@@ -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')
module/admin/model.php
+4 -4
View File
@@ -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;
}
/**