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

Merge branch 'zentaopms_239_task_#71598' into 'zentaopms_239'

Browse Source 
* Finish task #71598, #71599,#71600.

See merge request easycorp/zentaopms!5733
This commit is contained in:
王怡栋
2022-10-17 08:42:51 +00:00
parent 834549a7f0 0c15499b3d
commit 0843863e5d
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+3 -2
View File
@@ -1692,9 +1692,10 @@ class executionModel extends model
$executionPairs = array();
foreach($executions as $execution)
{
$executionPairs[$execution->id] = '';
if(isset($projects[$execution->project])) $executionPairs[$execution->id] .= $projects[$execution->project] . ' / ';
$executionPairs[$execution->id] = '';
$executionPairs[$execution->id] .= isset($projects[$execution->project]) ? ($projects[$execution->project] . ' / ') : '';
$executionPairs[$execution->id] .= $execution->name;
if(empty($execution->multiple)) $executionPairs[$execution->id] = $projects[$execution->project] . "({$this->lang->project->disableExecution})";
}
$executions = $executionPairs;