From 70358073e39ae9870c2e6b15b76709aec4ecb35a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 16 Sep 2021 11:33:53 +0800
Subject: [PATCH] * Fix bug #42594.

---
 module/bug/config.php  | 2 +-
 module/bug/control.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index 82b51996f6..e85eb78851 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -26,7 +26,7 @@ $config->bug->list->allFields = 'id, module, execution, story, task,
 
 $config->bug->list->defaultFields = 'id,severity,pri,title,openedBy,assignedTo,resolvedBy,resolution';
 
-$config->bug->list->exportFields = 'id, product, branch, module, execution, story, task,
+$config->bug->list->exportFields = 'id, product, branch, module, project, execution, story, task,
     title, keywords, severity, pri, type, os, browser,
     steps, status, deadline, activatedCount, confirmed, mailto,
     openedBy, openedDate, openedBuild,
diff --git a/module/bug/control.php b/module/bug/control.php
index 569e47945c..6515e2e1ff 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1719,6 +1719,7 @@ class bug extends control
             /* Get users, products and executions. */
             $users      = $this->loadModel('user')->getPairs('noletter');
             $products   = $this->loadModel('product')->getPairs();
+            $projects   = $this->loadModel('project')->getPairsByProgram();
             $executions = $this->loadModel('execution')->getPairs($this->projectID, 'all', 'all');
 
             /* Get related objects id lists. */
@@ -1777,6 +1778,7 @@ class bug extends control
 
                 /* fill some field with useful value. */
                 $bug->product   = !isset($products[$bug->product])     ? '' : $products[$bug->product] . "(#$bug->product)";
+                $bug->project   = !isset($projects[$bug->project])     ? '' : $projects[$bug->project] . "(#$bug->project)";
                 $bug->execution = !isset($executions[$bug->execution]) ? '' : $executions[$bug->execution] . "(#$bug->execution)";
                 $bug->story     = !isset($relatedStories[$bug->story]) ? '' : $relatedStories[$bug->story] . "(#$bug->story)";
                 $bug->task      = !isset($relatedTasks[$bug->task])    ? '' : $relatedTasks[$bug->task] . "($bug->task)";
@@ -1802,7 +1804,7 @@ class bug extends control
                 if(isset($users[$bug->lastEditedBy])) $bug->lastEditedBy = $users[$bug->lastEditedBy];
                 if(isset($users[$bug->closedBy]))     $bug->closedBy     = $users[$bug->closedBy];
 
-                $bug->title          = htmlspecialchars_decode($bug->title,ENT_QUOTES);
+                $bug->title = htmlspecialchars_decode($bug->title,ENT_QUOTES);
 
                 if($bug->linkBug)
                 {