* Adjust for bug #39682.

This commit is contained in:
wangyidong
2023-10-20 14:09:12 +08:00
parent 91ce85ac5e
commit 80e0b27c0f
3 changed files with 9 additions and 5 deletions
-1
View File
@@ -2008,7 +2008,6 @@ 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. */
-3
View File
@@ -1490,9 +1490,6 @@ class programModel extends model
$project->teamMembers = isset($teamMembers[$projectID]) ? array_keys($teamMembers[$projectID]) : array();
$project->leftTasks = isset($leftTasks[$projectID]) ? $leftTasks[$projectID]->tasks : '—';
/* Convert predefined HTML entities to characters. */
$project->name = htmlspecialchars_decode($project->name, ENT_QUOTES);
$stats[$projectID] = $project;
}
+9 -1
View File
@@ -2660,7 +2660,12 @@ class projectModel extends model
$doingExecutions = array();
$latestExecutions = array();
foreach($executions as $execution) $doingExecutions[$execution->project][$execution->id] = $execution;
foreach($executions as $execution)
{
if(!empty($execution->projectName)) $execution->projectName = htmlspecialchars_decode($execution->projectName);
$doingExecutions[$execution->project][$execution->id] = $execution;
}
foreach($doingExecutions as $projectID => $executions)
{
krsort($doingExecutions[$projectID]);
@@ -2674,6 +2679,9 @@ class projectModel extends model
{
if(strpos('wait,doing,closed', $project->status) === false) continue;
/* Convert predefined HTML entities to characters. */
$project->name = htmlspecialchars_decode($project->name, ENT_QUOTES);
$projectPath = explode(',', trim($project->path, ','));
$topProgram = !empty($project->parent) ? $projectPath[0] : $project->parent;