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

* Fix bug #44876.

Browse Source
This commit is contained in:
wangyidong
2024-01-24 14:42:40 +08:00
parent 3e4bc86f43
commit be96ea9867
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/navbar/v1.php
+3 -2
View File
@@ -222,7 +222,6 @@ class navbar extends wg
if($currentModule == strtolower($subModule) and $currentMethod == strtolower($subMethod))
{
$activeMainMenu = true;
if($activeMenuID) $activeMainMenu = $dropMenuName == $activeMenuID;
}
else
{
@@ -230,6 +229,7 @@ class navbar extends wg
if($subModule and in_array($currentModule, $subModule) and !str_contains(",$exclude,", ",$currentModule-$currentMethod,")) $activeMainMenu = true;
}
if($activeMenuID) $activeMainMenu = $dropMenuName == $activeMenuID;
if($activeMainMenu)
{
$activeMenu = $dropMenuName;
@@ -248,7 +248,8 @@ class navbar extends wg
}
if(empty($dropItems)) continue;
$items[] = array(
$items[] = array
(
'type' => 'dropdown',
'items' => $dropItems,
'class' => $class,
module/common/lang/menu.php
+4 -4
View File
@@ -231,8 +231,8 @@ $lang->scrum->menu->dynamic = array('link' => "$lang->dynamic|project|dynami
$lang->scrum->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'tree,stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team', 'exclude' => 'tree-browsetask');
$lang->scrum->menu->storyGroup['dropMenu'] = new stdclass();
$lang->scrum->menu->storyGroup['dropMenu']->story = array('link' => "{$lang->SRCommon}|projectstory|story|projectID=%s&productID=%s", 'subModule' => 'tree');
$lang->scrum->menu->storyGroup['dropMenu']->requirement = array('link' => "{$lang->URCommon}|projectstory|story|projectID=%s&productID=%s&branch=0&browseType=&param=0&storyType=requirement", 'subModule' => 'tree');
$lang->scrum->menu->storyGroup['dropMenu']->story = array('link' => "{$lang->SRCommon}|projectstory|story|projectID=%s&productID=%s", 'subModule' => 'tree,story');
$lang->scrum->menu->storyGroup['dropMenu']->requirement = array('link' => "{$lang->URCommon}|projectstory|story|projectID=%s&productID=%s&branch=0&browseType=&param=0&storyType=requirement", 'subModule' => 'tree,story');
$lang->scrum->dividerMenu = ',execution,programplan,doc,settings,';
@@ -360,8 +360,8 @@ $lang->execution->menu->settings = array('link' => "$lang->settings|execution|
$lang->execution->menu->more = array('link' => "$lang->more|execution|more|%s");
$lang->execution->menu->storyGroup['dropMenu'] = new stdclass();
$lang->execution->menu->storyGroup['dropMenu']->story = array('link' => "{$lang->SRCommon}|execution|story|executionID=%s");
$lang->execution->menu->storyGroup['dropMenu']->requirement = array('link' => "{$lang->URCommon}|execution|story|executionID=%s&storyType=requirement");
$lang->execution->menu->storyGroup['dropMenu']->story = array('link' => "{$lang->SRCommon}|execution|story|executionID=%s", 'subModule' => 'story');
$lang->execution->menu->storyGroup['dropMenu']->requirement = array('link' => "{$lang->URCommon}|execution|story|executionID=%s&storyType=requirement", 'subModule' => 'story');
/* Execution menu order. */
$lang->execution->menuOrder[5] = 'task';