From c41c562767cc285e7ac59a6a91bd5b906694abf3 Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Mon, 19 Sep 2022 06:45:18 +0000
Subject: [PATCH]  * Fix bug for menu.

---
 module/common/lang/menu.php            | 4 ++--
 module/story/js/batchcreate.js         | 2 ++
 module/story/view/batchcreate.html.php | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 01473fc88e..1365577762 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->common->story}|projectstory|story|projectID=%s&product=%s",'class' => 'dropdown dropdown-hover');
+$lang->scrum->menu->storyGroup = array('link' => "{$lang->common->story}|projectstory|story|projectID=%s&product=%s",'class' => 'dropdown dropdown-hover', 'exclude' => 'tree-browse');
 $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');
@@ -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->common->story}|projectstory|story|projectID=%s",'class' => 'dropdown dropdown-hover');
+$lang->waterfall->menu->storyGroup = array('link' => "{$lang->common->story}|projectstory|story|projectID=%s",'class' => 'dropdown dropdown-hover', 'exclude' => 'tree-browse');
 $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/story/js/batchcreate.js b/module/story/js/batchcreate.js
index 66e70dfda8..4cf5405fab 100644
--- a/module/story/js/batchcreate.js
+++ b/module/story/js/batchcreate.js
@@ -8,6 +8,8 @@ $(function()
         hiddenRequireFields();
     });
 
+    $("#navbar>ul>li[data-id='story']>ul>li[data-id!='" + storyType + "']").removeClass('active');
+
     /* Implement a custom form without feeling refresh. */
     $('#formSettingForm .btn-primary').click(function()
     {
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index a21158ac82..78a183ab04 100755
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -14,6 +14,7 @@
 <?php if($forceReview) $config->story->create->requiredFields .= ',review';?>
 <?php js::set('showFields', $showFields);?>
 <?php js::set('requiredFields', $config->story->create->requiredFields);?>
+<?php js::set('storyType', $type);?>
 <div id="mainContent" class="main-content">
   <div class="main-header">
     <h2><?php echo $storyID ? $storyTitle . ' - ' . $this->lang->story->subdivide : $this->lang->story->batchCreate;?></h2>