From 8f5471ebe68b6484d6a982a71fc60ce4d228a503 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 6 Apr 2021 11:19:09 +0800
Subject: [PATCH]  * Fix bug #11006,#11058.

---
 module/execution/model.php          | 5 +++++
 module/my/view/requirement.html.php | 2 +-
 module/my/view/story.html.php       | 2 +-
 module/product/model.php            | 2 +-
 module/story/control.php            | 2 ++
 module/story/js/batchedit.js        | 4 ++--
 module/story/js/common.js           | 1 +
 module/testcase/control.php         | 4 +++-
 module/testcase/js/common.js        | 2 +-
 9 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 549deb41ec..04b3a1fd1b 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1139,6 +1139,11 @@ class executionModel extends model
             $module = 'execution';
             $method = 'task';
         }
+        if($module == 'testcase' and ($method == 'view' || $method == 'edit' || $method == 'batchedit'))
+        {
+            $module = 'execution';
+            $method = 'testcase';
+        }
         if($module == 'build' and ($method == 'edit' || $method= 'view'))
         {
             $module = 'execution';
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index 79903679b3..7383b26bd7 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -156,7 +156,7 @@
         <?php
         if($canBatchEdit)
         {
-            $actionLink = $this->createLink('story', 'batchEdit');
+            $actionLink = $this->createLink('story', 'batchEdit', 'productID=0&executionID=0&branch=0&storyType=requirement');
             $misc       = "data-form-action='$actionLink'";
             echo html::commonButton($lang->edit, $misc);
         }
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 938f05c3f3..747cd8680d 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -159,7 +159,7 @@
         <?php
         if($canBatchEdit)
         {
-            $actionLink = $this->createLink('story', 'batchEdit');
+            $actionLink = $this->createLink('story', 'batchEdit', 'productID=0&executionID=0&branch=0&storyType=story');
             $misc       = "data-form-action='$actionLink'";
             echo html::commonButton($lang->edit, $misc);
         }
diff --git a/module/product/model.php b/module/product/model.php
index b08fdd668e..06e6add891 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -441,7 +441,7 @@ class productModel extends model
         }
 
         $fromModule   = $this->lang->navGroup->qa == 'qa' ? 'qa' : '';
-        $dropMenuLink = helper::createLink('product', 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra&from=$fromModule");
+        $dropMenuLink = helper::createLink($this->app->openApp == 'qa' ? 'product' : $this->app->openApp, 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra&from=$fromModule");
 
         $output  = "<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProductName}'><span class='text'>{$currentProductName}</span> <span class='caret' style='margin-top: 3px'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
         $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
diff --git a/module/story/control.php b/module/story/control.php
index 7fe536dca2..73c84dc0d4 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -696,6 +696,8 @@ class story extends control
         {
             /* The stories of my. */
             $this->loadModel('my')->setMenu();
+            $this->lang->my->menu->work['subModule']       = 'story';
+            $this->lang->my->menu->contribute['subModule'] = 'story';
 
             $branchProduct = false;
             $productIdList = array();
diff --git a/module/story/js/batchedit.js b/module/story/js/batchedit.js
index b4fff1bb6b..bf3a1adbae 100644
--- a/module/story/js/batchedit.js
+++ b/module/story/js/batchedit.js
@@ -1,7 +1,7 @@
 /**
  * Set duplicate field.
- * 
- * @param  string $resolution 
+ *
+ * @param  string $resolution
  * @param  int    $storyID
  * @access public
  * @return void
diff --git a/module/story/js/common.js b/module/story/js/common.js
index 3a1a033bff..d10373ef4e 100644
--- a/module/story/js/common.js
+++ b/module/story/js/common.js
@@ -9,6 +9,7 @@ $(function()
     {
         $('#navbar .nav li').removeClass('active');
         $("#navbar .nav li[data-id=" + storyType + ']').addClass('active');
+        $('#subNavbar li[data-id="' + storyType + '"]').addClass('active');
     }
 })
 
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 8834b45ca8..3967f4eace 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -747,7 +747,9 @@ class testcase extends control
             $position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
 
             /* Set menu. */
-            $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $case->branch);
+            if($this->app->openApp == 'project')   $this->loadModel('project')->setMenu($this->session->project);
+            if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($this->session->execution);
+            if($this->app->openApp == 'qa')        $this->testcase->setMenu($this->products, $productID, $case->branch);
 
             $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $case->branch);
             if($case->lib and $case->fromCaseID)
diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js
index cc09050347..ab596a743e 100644
--- a/module/testcase/js/common.js
+++ b/module/testcase/js/common.js
@@ -55,7 +55,7 @@ function loadProductBranches(productID)
         if(data)
         {
             $('#product').closest('.input-group').append(data);
-            $('#branch').css('width', config.currentMethod == 'create' ? '120px' : '65px');
+            $('#branch').css('width', config.currentMethod == 'create' ? '120px' : '95px');
         }
     })
 }