From 9ad2d2617e2c6a45be45a748c80e04bf11be137e Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 22 Dec 2020 17:19:21 +0800
Subject: [PATCH] * Finish task #8785.

---
 module/release/lang/en.php          | 1 +
 module/release/lang/zh-cn.php       | 1 +
 module/release/model.php            | 3 ++-
 module/release/view/browse.html.php | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index a72fab0953..b8c0f7a668 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -35,6 +35,7 @@ $lang->release->basicInfo = 'Basic Info';
 $lang->release->id            = 'ID';
 $lang->release->product       = $lang->productCommon;
 $lang->release->branch        = 'Platform/Branch';
+$lang->release->project       = 'Project';
 $lang->release->build         = 'Build';
 $lang->release->name          = 'Name';
 $lang->release->marker        = 'Milestone';
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 5614cfd952..aad1537831 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -35,6 +35,7 @@ $lang->release->basicInfo = '基本信息';
 $lang->release->id            = 'ID';
 $lang->release->product       = $lang->productCommon;
 $lang->release->branch        = '平台/分支';
+$lang->release->project       = '所属项目';
 $lang->release->build         = '版本';
 $lang->release->name          = '发布名称';
 $lang->release->marker        = '里程碑';
diff --git a/module/release/model.php b/module/release/model.php
index 3258d7b7bb..df1549f5d5 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -51,10 +51,11 @@ class releaseModel extends model
      */
     public function getList($productID, $branch = 0, $type = 'all')
     {
-        return $this->dao->select('t1.*, t2.name as productName, t3.id as buildID, t3.name as buildName, t3.project')
+        return $this->dao->select('t1.*, t2.name as productName, t3.id as buildID, t3.name as buildName, t3.project, t4.name as PRJName')
             ->from(TABLE_RELEASE)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
             ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build = t3.id')
+            ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.PRJ = t4.id')
             ->where('t1.product')->eq((int)$productID)
             ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
             ->beginIF($type != 'all')->andWhere('t1.status')->eq($type)->fi()
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 1887955667..64b047ea20 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -43,6 +43,7 @@
       <tr>
         <th class='w-id'><?php echo $lang->release->id;?></th>
         <th><?php echo $lang->release->name;?></th>
+        <th><?php echo $lang->release->project;?></th>
         <th><?php echo $lang->release->build;?></th>
         <?php if($product->type != 'normal'):?>
         <th class='text-center w-100px'><?php echo $lang->product->branch;?></th>
@@ -67,6 +68,7 @@
           echo html::a(inlink('view', "release=$release->id"), $release->name) . $flagIcon;
           ?>
         </td>
+        <td title='<?php echo $release->PRJName?>'><?php echo $release->PRJName;?></td>
         <td title='<?php echo $release->buildName?>'><?php echo empty($release->project) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?></td>
         <?php if($product->type != 'normal'):?>
         <td class='text-center' title='<?php echo zget($branches, $release->branch, '');?>'><?php echo $branches[$release->branch];?></td>