From 346b0cf9e20169e422ded1959478d005c041b582 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 3 Dec 2021 09:35:36 +0800
Subject: [PATCH] * Finish task#45015.

---
 module/execution/model.php    | 4 ++++
 module/product/model.php      | 4 ++++
 module/testreport/control.php | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index d59a6b7c6e..49003345ce 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1374,6 +1374,10 @@ class executionModel extends model
         {
             $link = helper::createLink($module, 'browse', "executionID=%s&from=execution");
         }
+        elseif($module == 'testreport' and $method == 'create')
+        {
+            $link = helper::createLink('execution', 'testtask', "executionID=%s");
+        }
         else
         {
             $link = helper::createLink($module, $method, "executionID=%s");
diff --git a/module/product/model.php b/module/product/model.php
index 0f3bef5504..8d7adf489d 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1987,6 +1987,10 @@ class productModel extends model
                 $projectID = isset($output['projectID']) ? $output['projectID'] : 0;
                 $link      = helper::createLink($module, $method, "productID=%s&branch=" . ($branch ? "%s" : '') . "&groupBy=&projectID=$projectID") . "#app=project";
             }
+            elseif($module == 'testreport' and $method == 'create')
+            {
+                $link = helper::createLink($module, $method, "objectID=&objectType=testtask&extra=%s");
+            }
             else
             {
                 $link = helper::createLink($module, $method, "productID=%s" . ($branch ? "&branch=%s" : ''));
diff --git a/module/testreport/control.php b/module/testreport/control.php
index b5ce1cfbe5..5f3a9164c2 100644
--- a/module/testreport/control.php
+++ b/module/testreport/control.php
@@ -189,7 +189,7 @@ class testreport extends control
             $taskPairs         = array();
             $scopeAndStatus[0] = 'local';
             $scopeAndStatus[1] = 'totalStatus';
-            $tasks = $this->testtask->getProductTasks($productID, $task->branch, 'id_desc', null, $scopeAndStatus);
+            $tasks = $this->testtask->getProductTasks($productID, empty($objectID) ? 0 : $task->branch, 'id_desc', null, $scopeAndStatus);
             foreach($tasks as $testTask)
             {
                 if($testTask->build == 'trunk') continue;