From 4d7b80b8a2c3a5fa09f3feb385425ef577b67a7a Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Wed, 3 Jan 2024 21:11:52 +0800 Subject: [PATCH] * Fix bug#42811. --- module/common/lang/menu.php | 4 ++-- module/project/tao.php | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index ae8fda0a3f..b9ea3c1279 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -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", 'subModule' => 'story'); -$lang->execution->menu->storyGroup['dropMenu']->requirement = array('link' => "{$lang->URCommon}|execution|story|executionID=%s&storyType=requirement", 'subModule' => 'story'); +$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"); /* Execution menu order. */ $lang->execution->menuOrder[5] = 'task'; diff --git a/module/project/tao.php b/module/project/tao.php index 60774a1a7d..209a5dce3d 100755 --- a/module/project/tao.php +++ b/module/project/tao.php @@ -1023,6 +1023,8 @@ class projectTao extends projectModel $lang->project->menu->story['link'] = sprintf($lang->project->menu->storyGroup['link'], '%s', $projectProduct); $lang->project->menu->story['dropMenu']->story['link'] = sprintf($lang->project->menu->storyGroup['dropMenu']->story['link'], '%s', $projectProduct); $lang->project->menu->story['dropMenu']->requirement['link'] = sprintf($lang->project->menu->storyGroup['dropMenu']->requirement['link'], '%s', $projectProduct); + if(isset($this->app->params['storyType']) && $this->app->params['storyType'] == 'story') $lang->project->menu->story['dropMenu']->story['subModule'] .= ',story'; + if(isset($this->app->params['storyType']) && $this->app->params['storyType'] == 'requirement') $lang->project->menu->story['dropMenu']->requirement['subModule'] .= ',story'; } unset($lang->project->menu->settings['subMenu']->products); @@ -1052,6 +1054,9 @@ class projectTao extends projectModel $lang->$navGroup->menu->story['dropMenu']->story['link'] = sprintf($lang->$navGroup->menu->storyGroup['dropMenu']->story['link'], '%s', $project->id); $lang->$navGroup->menu->story['dropMenu']->requirement['link'] = sprintf($lang->$navGroup->menu->storyGroup['dropMenu']->requirement['link'], '%s', $project->id); + + if(isset($this->app->params['storyType']) && $this->app->params['storyType'] == 'story') $lang->$navGroup->menu->story['dropMenu']->story['subModule'] = 'story'; + if(isset($this->app->params['storyType']) && $this->app->params['storyType'] == 'requirement') $lang->$navGroup->menu->story['dropMenu']->requirement['subModule'] = 'story'; } if(isset($lang->$navGroup->menu->storyGroup)) unset($lang->$navGroup->menu->storyGroup);