Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug 35631, and show requirement file in doc.

Browse Source
This commit is contained in:
songchenxuan
2023-05-30 16:59:33 +08:00
parent b7edd585bc
commit ea6ada7acc
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+1 -1
View File
@@ -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()
module/execution/model.php
+1
View File
@@ -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. */