Merge branch 'zentaopms_261_bug_#29851' into 'master'

* Fix bug #29851.

See merge request easycorp/zentaopms!6177
This commit is contained in:
王怡栋
2022-11-16 02:04:30 +00:00
2 changed files with 5 additions and 6 deletions
+2 -2
View File
@@ -51,8 +51,8 @@
<tr>
<th class='c-id'><?php echo $lang->release->id;?></th>
<th class="c-name"><?php echo $lang->release->name;?></th>
<th class='text-center c-build'><?php echo $lang->release->includedBuild;?></th>
<th class='text-center c-project'><?php echo $lang->release->relatedProject;?></th>
<th class='c-build'><?php echo $lang->release->includedBuild;?></th>
<th class='c-project'><?php echo $lang->release->relatedProject;?></th>
<th class='text-center c-status'><?php echo $lang->release->status;?></th>
<th class='c-date text-center'><?php echo $lang->release->date;?></th>
<?php
+3 -4
View File
@@ -353,13 +353,12 @@
<th><?php echo $lang->release->build;?></th>
<td>
<?php
$i = 1;
$buildHtml = array();
foreach($release->builds as $build)
{
$buildDivision = $i == count($release->builds) ? '' : $lang->comma;
echo (($build->project) ? html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$build->id"), $build->name) : $build->name) . $buildDivision;
$i++;
$buildHtml[] = html::a($this->createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$build->id"), $build->name, '', "data-app='project'");
}
echo join($lang->comma, $buildHtml);
?>
</td>
</tr>