From 2f7e39685c15d1401a17b46d440b68eb7c525bc6 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Wed, 16 Nov 2022 09:34:31 +0800
Subject: [PATCH] * finish task #75921

---
 module/bug/view/view.html.php | 1 -
 module/common/lang/menu.php   | 2 +-
 module/execution/model.php    | 5 +++++
 module/story/control.php      | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 77767bbee6..247a92c471 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -9,7 +9,6 @@
  * @version     $Id: view.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index d5a9edadfd..2d49c73c55 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -343,7 +343,7 @@ $lang->execution->menu->view   = array('link' => "$lang->view|execution|grouptas
 if($config->edition != 'open') $lang->execution->menu->view = array('link' => "$lang->view|execution|gantt|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation');
 
 $lang->execution->menu->storyGroup = array('link' => "{$lang->common->story}|execution|story|executionID=%s",'class' => 'dropdown dropdown-hover', 'subModule' => 'story', 'alias' => 'batchcreate,storykanban');
-$lang->execution->menu->story      = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'storykanban');
+$lang->execution->menu->story      = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story,execution', 'alias' => 'storykanban');
 $lang->execution->menu->qa         = array('link' => "{$lang->qa->common}|execution|bug|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport');
 $lang->execution->menu->devops     = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
 $lang->execution->menu->doc        = array('link' => "{$lang->doc->common}|doc|tableContents|type=execution&objectID=%s", 'subModule' => 'doc');
diff --git a/module/execution/model.php b/module/execution/model.php
index 42ccba915f..129b2aa23c 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -142,6 +142,11 @@ class executionModel extends model
         $this->loadModel('project')->setNoMultipleMenu($executionID);
 
         if(isset($this->lang->execution->menu->storyGroup)) unset($this->lang->execution->menu->storyGroup);
+        if(isset($this->lang->execution->menu->story['dropMenu']) and $methodName == 'storykanban')
+        {
+            unset($this->lang->execution->menu->story['dropMenu']);
+            $this->lang->execution->menu->story['link'] = str_replace(array($this->lang->common->story, 'story'), array($this->lang->SRCommon, 'storykanban'), $this->lang->execution->menu->story['link']);
+        }
     }
 
     /**
diff --git a/module/story/control.php b/module/story/control.php
index 0877c6779d..ec9cf2768d 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2815,9 +2815,9 @@ class story extends control
         /* Unset product field when in single project.  */
         if(isset($project->hasProduct) && !$project->hasProduct)
         {
-            $filterFields = array('product,', 'branch,');
-            if($project->model != 'scrum') $filterFields[] = 'plan,';
-            $this->config->story->exportFields = str_replace($filterFields, '', $this->config->story->exportFields);
+            $filterFields = array(', product,', ', branch,');
+            if($project->model != 'scrum') $filterFields[] = ', plan,';
+            $this->config->story->exportFields = str_replace($filterFields, ',', $this->config->story->exportFields);
         }
 
         $this->view->fileName        = $fileName;