From 4945af28d7e4d74be3c13c5366be31197bdaf92b Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 20 Dec 2023 10:59:10 +0800
Subject: [PATCH] * Adjust repo link task filter rule.

---
 module/repo/control.php |  2 +-
 module/repo/zen.php     | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/module/repo/control.php b/module/repo/control.php
index 19e281b579..c88e578d31 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -931,7 +931,7 @@ class repo extends control
 
         $this->view->modules      = $modules;
         $this->view->users        = $this->loadModel('user')->getPairs('noletter');
-        $this->view->allTasks     = $this->repoZen->getLinkTasks($repoID, $revision, $browseType, $product, $orderBy, $pager, $queryID, $productExecutionIDs);
+        $this->view->allTasks     = $this->repoZen->getLinkTasks($repoID, $revision, $browseType, $orderBy, $pager, $queryID, $productExecutionIDs);
         $this->view->product      = $product;
         $this->view->repoID       = $repoID;
         $this->view->revision     = $revision;
diff --git a/module/repo/zen.php b/module/repo/zen.php
index 9e84b9c8d7..5b980a7c5f 100644
--- a/module/repo/zen.php
+++ b/module/repo/zen.php
@@ -1058,7 +1058,6 @@ class repoZen extends repo
      * @param  int       $repoID
      * @param  string    $revision
      * @param  string    $browseType
-     * @param  object    $product
      * @param  string    $orderBy
      * @param  object    $pager
      * @param  int       $queryID
@@ -1066,13 +1065,20 @@ class repoZen extends repo
      * @access protected
      * @return array
      */
-    protected function getLinkTasks(int $repoID, string $revision, string $browseType, object $product, string $orderBy, object $pager, int $queryID, array $productExecutionIDs): array
+    protected function getLinkTasks(int $repoID, string $revision, string $browseType, string $orderBy, object $pager, int $queryID, array $productExecutionIDs): array
     {
         $allTasks = array();
-        foreach($productExecutionIDs as $productExecutionID)
+        if($browseType == 'bySearch')
         {
-            $tasks    = $this->loadModel('execution')->getTasks(0, $productExecutionID, array(), $browseType, $queryID, 0, $orderBy, null);
-            $allTasks = array_merge($tasks, $allTasks);
+            $allTasks = $this->loadModel('execution')->getTasks(0, 0, array(), $browseType, $queryID, 0, $orderBy, null);
+        }
+        else
+        {
+            foreach($productExecutionIDs as $productExecutionID)
+            {
+                $tasks    = $this->loadModel('execution')->getTasks(0, $productExecutionID, array(), $browseType, $queryID, 0, $orderBy, null);
+                $allTasks = array_merge($tasks, $allTasks);
+            }
         }
 
         /* Filter linked tasks. */