From ea6ada7acc7c0103ea15a22203def9e09a6607ee Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Tue, 30 May 2023 16:59:24 +0800
Subject: [PATCH] * Fix bug 35631, and show requirement file in doc.

---
 module/doc/model.php       | 2 +-
 module/execution/model.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index 9e7cf56f45..108dfe6651 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1962,7 +1962,7 @@ class docModel extends model
             ->beginIF($type == 'project' or $type == 'execution')
             ->orWhere("(objectType = 'task' and objectID in ($taskIdList))")
             ->orWhere("(objectType = 'build' and objectID in ($buildIdList))")
-            ->beginIF($storyIDList)->orWhere("(objectType = 'story' and objectID in ($storyIDList))")->fi()
+            ->beginIF($storyIDList)->orWhere("((objectType = 'story' OR objectType = 'requirement') and objectID in ($storyIDList))")->fi()
             ->fi()
             ->markRight(1)
             ->beginIF($searchTitle !== false)->andWhere('title')->like("%{$searchTitle}%")->fi()
diff --git a/module/execution/model.php b/module/execution/model.php
index e24b524ba9..bc7e4ca317 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1954,6 +1954,7 @@ class executionModel extends model
         $parentList = array();
         foreach($executions as $key => $execution)
         {
+            $execution->projectName = htmlspecialchars_decode($execution->projectName);
             $execution->productName = isset($productNameList[$execution->id]) ? $productNameList[$execution->id] : '';
 
             /* Process the end time. */