From bfe5c251cc030400bb49d2b70df01a5730a9f651 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Wed, 31 Mar 2021 10:11:07 +0300
Subject: [PATCH] * Fix bug#11701.

---
 module/testtask/control.php               | 2 ++
 module/testtask/view/browseunits.html.php | 1 -
 module/testtask/view/results.html.php     | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 024c9b562a..ea9f607912 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -145,6 +145,8 @@ class testtask extends control
         $productID = $this->loadModel('product')->saveState($productID, $this->products);
         if($this->app->openApp == 'project')
         {
+            $this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
+            $this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
             $this->loadModel('project')->setMenu($this->session->project);
             $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
         }
diff --git a/module/testtask/view/browseunits.html.php b/module/testtask/view/browseunits.html.php
index de6016d077..60bdf96b80 100644
--- a/module/testtask/view/browseunits.html.php
+++ b/module/testtask/view/browseunits.html.php
@@ -96,7 +96,6 @@ $(function()
 {
     $('#<?php echo $browseType?>UnitTab').addClass('selected');
     $('#browseunitsTab').addClass('btn-active-text');
-    $('#subNavbar li[data-id="case"]').addClass('active');
 })
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 9152ac8596..1ebed67c9d 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -50,7 +50,8 @@
           <td class='w-60px'><?php if(!empty($result->files)) echo html::a("#caseResult{$result->id}", $lang->files . $fileCount, '', "data-toggle='modal' data-type='iframe'")?></td>
           <td class='w-50px text-center'><i class='collapse-handle icon-angle-down text-muted'></i></td>
         </tr>
-        <?php $params = isset($testtask) ? ",testtask=$testtask->id,executionID=$testtask->execution,buildID=$testtask->build" : '';?>
+        <?php $executionParam = $this->app->openApp == 'execution' ? "executionID=$testtask->execution," : '';?>
+        <?php $params = isset($testtask) ? ",testtask=$testtask->id,{$executionParam}buildID=$testtask->build" : '';?>
         <tr class='result-detail hide' id='tr-detail_<?php echo $trCount++; ?>'>
           <td colspan='7' class='pd-0'>
             <?php $projectParam = $this->app->openApp == 'project' ? "projectID={$this->session->project}," : ''?>