From 4c0eb137dacf4c5c6d9199d31bd4a7628cd575f6 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 30 Nov 2021 19:43:49 +0800
Subject: [PATCH] * Finish task#45004.

---
 module/testtask/control.php   | 2 +-
 module/testtask/css/cases.css | 2 ++
 module/tree/model.php         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index c3d11b3774..4da757f3e5 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -551,7 +551,7 @@ class testtask extends control
         $this->view->runs           = $runs;
         $this->view->users          = $this->loadModel('user')->getPairs('noclosed|qafirst|noletter');
         $this->view->assignedToList = $assignedToList;
-        $this->view->moduleTree     = $this->loadModel('tree')->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createTestTaskLink'), $extra = $taskID);
+        $this->view->moduleTree     = $this->loadModel('tree')->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createTestTaskLink'), $extra = $taskID, $task->branch);
         $this->view->browseType     = $browseType;
         $this->view->param          = $param;
         $this->view->orderBy        = $orderBy;
diff --git a/module/testtask/css/cases.css b/module/testtask/css/cases.css
index f1bdbfe5d9..b556841989 100644
--- a/module/testtask/css/cases.css
+++ b/module/testtask/css/cases.css
@@ -16,3 +16,5 @@ td .warning {color: red;}
 
 .fail .result-fail, .blocked .result-blocked {color: #f00;}
 .pass .result-pass {color: green;}
+
+.tree li > a.active {color: #0c64eb;}
diff --git a/module/tree/model.php b/module/tree/model.php
index b1b5d08adb..7041011faf 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -397,7 +397,7 @@ class treeModel extends model
         {
             $branchName = $this->branch->getById($branch);
             $branches   = array($branch => $branchName);
-            $extra      = array('rootID' => $rootID, 'branch' => $branch);
+            $extra      = $userFunc[1] == 'createTestTaskLink' ? $extra : array('rootID' => $rootID, 'branch' => $branch);
         }
 
         $manage  = $userFunc[1] == 'createManageLink' ? true : false;