From 34bfa0e42383a7446064a7887e6859d5ece982ba Mon Sep 17 00:00:00 2001 From: liuruogu Date: Fri, 16 Sep 2022 02:43:34 +0000 Subject: [PATCH] * Light menu. --- module/common/lang/menu.php | 8 ++++---- module/product/js/browse.js | 4 ++-- module/project/model.php | 12 +++++++----- module/story/js/common.js | 3 ++- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index d5daec84cb..aa20bb80ab 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -202,7 +202,7 @@ if($config->systemMode == 'new') $lang->project->homeMenu->kanban = array('link' $lang->scrum->menu = new stdclass(); $lang->scrum->menu->index = array('link' => "{$lang->dashboard}|project|index|project=%s"); $lang->scrum->menu->execution = array('link' => "$lang->executionCommon|project|execution|status=all&projectID=%s", 'exclude' => 'execution-testreport', 'subModule' => 'task'); -$lang->scrum->menu->storyGroup = array('link' => "{$lang->story->story}|projectstory|story|projectID=%s&product=%s",'class' => 'dropdown dropdown-hover'); +$lang->scrum->menu->storyGroup = array('link' => "{$lang->story->story}|projectstory|story|projectID=%s&productID=%s",'class' => 'dropdown dropdown-hover', 'subModule' => 'projectstory,story'); $lang->scrum->menu->story = array('link' => "$lang->SRCommon|projectstory|story|projectID=%s|story", 'subModule' => 'projectstory,tree', 'alias' => 'story,track'); $lang->scrum->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=project&objectID=%s", 'subModule' => 'doc'); $lang->scrum->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport,execution', 'alias' => 'bug,testtask,testcase,testreport', 'exclude' => 'execution-create,execution-batchedit'); @@ -213,8 +213,8 @@ $lang->scrum->menu->dynamic = array('link' => "$lang->dynamic|project|dynamic $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'); $lang->scrum->menu->storyGroup['dropMenu'] = new stdclass(); -$lang->scrum->menu->storyGroup['dropMenu']->story = array('link' => "{$lang->SRCommon}|projectstory|story|projectID=%s&productID=%s|story", 'subModule' => 'projectstory,tree', 'alias' => 'story,track'); -$lang->scrum->menu->storyGroup['dropMenu']->requirement = array('link' => "{$lang->URCommon}|projectstory|story|projectID=%s&productID=%s&branch=0&browseType=¶m=0&storyType=requirement|requirement", 'subModule' => 'projectstory,tree', 'alias' => 'story,track'); +$lang->scrum->menu->storyGroup['dropMenu']->story = array('link' => "{$lang->SRCommon}|projectstory|story|projectID=%s&productID=%s", 'subModule' => 'projectstory,tree', 'alias' => 'story,track'); +$lang->scrum->menu->storyGroup['dropMenu']->requirement = array('link' => "{$lang->URCommon}|projectstory|story|projectID=%s&productID=%s&branch=0&browseType=¶m=0&storyType=requirement", 'subModule' => 'projectstory,tree', 'alias' => 'story,track'); $lang->scrum->dividerMenu = ',execution,programplan,doc,settings,'; @@ -253,7 +253,7 @@ $lang->scrum->menu->settings['subMenu']->module = array('link' => "{$lang-> $lang->waterfall->menu = new stdclass(); $lang->waterfall->menu->index = array('link' => "$lang->dashboard|project|index|project=%s"); $lang->waterfall->menu->execution = array('link' => "{$lang->stage->common}|project|execution|status=all&projectID=%s", 'subModule' => 'programplan,task'); -$lang->waterfall->menu->storyGroup = array('link' => "{$lang->story->story}|projectstory|story|projectID=%s",'class' => 'dropdown dropdown-hover'); +$lang->waterfall->menu->storyGroup = array('link' => "{$lang->story->story}|projectstory|story|projectID=%s&productID=%s",'class' => 'dropdown dropdown-hover'); $lang->waterfall->menu->story = array('link' => "$lang->SRCommon|projectstory|story|projectID=%s", 'subModule' => 'projectstory,tree', 'alias' => 'story,track'); $lang->waterfall->menu->design = array('link' => "{$lang->design->common}|design|browse|project=%s"); $lang->waterfall->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport', 'alias' => 'bug,testtask,testcase,testreport'); diff --git a/module/product/js/browse.js b/module/product/js/browse.js index 47ea4452c4..17e5d9c6c9 100644 --- a/module/product/js/browse.js +++ b/module/product/js/browse.js @@ -7,8 +7,8 @@ $(function() if(rawModule == 'projectstory') { - $('#navbar .nav li[data-id=storyGroup]').addClass('active'); - $('#navbar .nav li[data-id=storyGroup]>a').html($('.active [data-id=' + storyType + ']').text() + ''); + $('#navbar .nav>li[data-id=story]').addClass('active'); + $('#navbar .nav>li[data-id=story]>a').html($('.active [data-id=' + storyType + ']').text() + ''); } $(document).ready(function(){ diff --git a/module/project/model.php b/module/project/model.php index bfa26c65a1..5fd5af46d6 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2454,23 +2454,25 @@ class projectModel extends model if(empty($project->hasProduct)) { - unset($lang->project->menu->story); + $lang->project->menu->story = $lang->project->menu->storyGroup; + unset($lang->project->menu->settings['subMenu']->products); + $projectProduct = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($objectID)->fetch()->product; $lang->project->menu->settings['subMenu']->module['link'] = sprintf($lang->project->menu->settings['subMenu']->module['link'], $projectProduct); if($model !== 'kanbanProject') { - $lang->project->menu->storyGroup['link'] = sprintf($lang->project->menu->storyGroup['link'], '%s', $projectProduct); - $lang->project->menu->storyGroup['dropMenu']->story['link'] = sprintf($lang->project->menu->storyGroup['dropMenu']->story['link'], '%s', $projectProduct); - $lang->project->menu->storyGroup['dropMenu']->requirement['link'] = sprintf($lang->project->menu->storyGroup['dropMenu']->requirement['link'], '%s', $projectProduct); + $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); } } else { unset($lang->project->menu->settings['subMenu']->module); - unset($lang->project->menu->storyGroup); } + unset($lang->project->menu->storyGroup); /* Reset project priv. */ $moduleName = $this->app->rawModule; diff --git a/module/story/js/common.js b/module/story/js/common.js index ce4a67d484..db3973064e 100644 --- a/module/story/js/common.js +++ b/module/story/js/common.js @@ -7,9 +7,10 @@ $(function() if(typeof(execution) != 'undefined') rawModule = 'projectstory'; if(['project', 'projectstory'].indexOf(rawModule) === -1 && app != 'qa') { - if(app != 'my') $('#navbar .nav li').removeClass('active'); + if(app != 'my') $('#navbar .nav li[data-id!=story]').removeClass('active'); $("#navbar .nav li[data-id=" + storyType + ']').addClass('active'); $('#subNavbar li[data-id="' + storyType + '"]').addClass('active'); + $('#navbar .nav>li[data-id=story]>a').html($('.active [data-id=' + storyType + ']').text() + ''); } $('#saveButton').on('click', function()