From ccbacddf4b1c52dd105d12492335807bb91c864e Mon Sep 17 00:00:00 2001
From: liugang <liugang@easycorp.ltd>
Date: Tue, 27 Sep 2022 13:40:23 +0800
Subject: [PATCH] * Task 70747 - redirect to the project's detail page when
 click the shadow product's name.

---
 module/report/model.php               | 8 +++++++-
 module/report/view/bugassign.html.php | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/module/report/model.php b/module/report/model.php
index 3f7caf50be..0014ec7388 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -424,12 +424,17 @@ class reportModel extends model
      */
     public function getBugAssign()
     {
-        $bugs = $this->dao->select('t1.*, t2.name as productName')->from(TABLE_BUG)->alias('t1')
+        $bugs = $this->dao->select('t1.*, t2.name AS productName')->from(TABLE_BUG)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
             ->where('t1.deleted')->eq(0)
             ->andWhere('t1.status')->eq('active')
             ->andWhere('t2.deleted')->eq(0)
             ->fetchGroup('assignedTo');
+        $productProjects = $this->dao->select('t2.product, t2.project')->from(TABLE_PROJECT)->alias('t1')
+            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.project')
+            ->where('t1.type')->eq('project')
+            ->andWhere('t1.hasProduct')->eq(0)
+            ->fetchPairs();
         $assign = array();
         foreach($bugs as $user => $userBugs)
         {
@@ -439,6 +444,7 @@ class reportModel extends model
                 {
                     $assign[$user]['bug'][$bug->productName]['count']     = isset($assign[$user]['bug'][$bug->productName]['count']) ? $assign[$user]['bug'][$bug->productName]['count'] + 1 : 1;
                     $assign[$user]['bug'][$bug->productName]['productID'] = $bug->product;
+                    $assign[$user]['bug'][$bug->productName]['projectID'] = zget($productProjects, $bug->product, 0);
                     $assign[$user]['total']['count']   = isset($assign[$user]['total']['count']) ? $assign[$user]['total']['count'] + 1 : 1;
                 }
             }
diff --git a/module/report/view/bugassign.html.php b/module/report/view/bugassign.html.php
index b56b4a9661..b44b1acd12 100644
--- a/module/report/view/bugassign.html.php
+++ b/module/report/view/bugassign.html.php
@@ -39,7 +39,10 @@
                 <?php $id = 1;?>
                 <?php foreach($assign['bug'] as $product => $count):?>
                 <?php if($id != 1) echo '<tr class="a-center text-center">';?>
-                <td><?php echo html::a($this->createLink('product', 'view', "product={$count['productID']}"), $product);?></td>
+                <td>
+                  <?php $viewLink = empty($count['projectID']) ? $this->createLink('product', 'view', "product={$count['productID']}") : $this->createLink('project', 'view', "projectID={$count['projectID']}");?>
+                  <?php echo html::a($viewLink, $product);?>
+                </td>
                 <td><?php echo $count['count'];?></td>
                 <?php if($id == 1):?>
                 <td rowspan="<?php echo count($assign['bug']);?>">