From 0e0b51d683ebb9f6067aaa22cfd83f98ceb3d6b6 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Wed, 24 Mar 2021 10:11:21 +0800
Subject: [PATCH] * Modify the problem of execution creat requirement jump.

---
 module/common/lang/menu.php         | 2 +-
 module/product/view/browse.html.php | 2 +-
 module/story/control.php            | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 1d4b97846a..ec53cbb9be 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -262,7 +262,7 @@ $lang->execution->menu->task     = array('link' => "{$lang->task->common}|execut
 $lang->execution->menu->kanban   = array('link' => "$lang->kanban|execution|kanban|executionID=%s");
 $lang->execution->menu->burn     = array('link' => "$lang->burn|execution|burn|executionID=%s");
 $lang->execution->menu->view     = array('link' => "$lang->view|execution|grouptask|executionID=%s", 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
-$lang->execution->menu->story    = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'linkstory,storykanban');
+$lang->execution->menu->story    = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'batchcreate,linkstory,storykanban');
 $lang->execution->menu->qa       = array('link' => "{$lang->qa->common}|execution|qa|executionID=%s", 'subModule' => 'bug', 'alias' => 'qa,bug,testcase,testtask,testreport');
 $lang->execution->menu->repo     = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo');
 $lang->execution->menu->doc      = array('link' => "{$lang->doc->common}|doc|objectLibs|type=execution&objectID=%s", 'subModule' => 'doc');
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index d6885fc8ff..7e39517bcd 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -135,7 +135,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
     </div>
     <?php if(common::canModify('product', $product)):?>
     <div class='btn-group dropdown'>
-      <?php echo html::a($this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=$projectID"), "<i class='icon icon-plus'></i> {$lang->story->create}", '', "class='btn btn-primary'");?>
+      <?php echo html::a($this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=$projectID"), "<i class='icon icon-plus'></i> {$lang->story->create}", '', "class='btn btn-primary' data-app='$openApp'");?>
       <button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
       <ul class='dropdown-menu'>
         <li>
diff --git a/module/story/control.php b/module/story/control.php
index c178ee9a8d..95ac801a0d 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -51,11 +51,15 @@ class story extends control
         $this->story->replaceURLang($type);
         if($this->app->openApp == 'product')
         {
-            $this->loadModel('product')->setMenu($productID);
+            $this->product->setMenu($productID);
         }
         else if($this->app->openApp == 'project')
         {
-            $this->loadModel('project')->setMenu($objectID);
+            $this->project->setMenu($objectID);
+        }
+        else if($this->app->openApp == 'execution')
+        {
+            $this->execution->setMenu($objectID);
         }
 
         /* Whether there is a object to transfer story, for example feedback. */