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

* Finish task #8164.

Browse Source
This commit is contained in:
Yagami
2020-10-27 14:46:03 +08:00
parent 5002be3199
commit 0f3348ad2a
9 changed files with 100 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/view/mergeprogram.html.php
+5 -5
View File
@@ -28,7 +28,7 @@
<?php elseif($type == 'moreLink'):?>
<div class='alert alert-info'>
<?php
printf($lang->upgrade->mergeSummary, $noMergedProductCount, $noMergedProjectCount);
printf($lang->upgrade->mergeSummary, $noMergedProductCount, $noMergedSprintCount);
echo '<br />' . $lang->upgrade->mergeByMoreLink;
?>
</div>
@@ -37,15 +37,15 @@
<tr>
<th><?php echo $lang->upgrade->project;?></th>
<th class='divider'></th>
<th class='gray w-p50'><?php echo $lang->upgrade->program;?></th>
<th class='w-p50'><?php echo $lang->upgrade->program;?></th>
</tr>
</thead>
<tbody>
<?php foreach($noMergedProjects as $projectID => $project):?>
<?php foreach($noMergedSprints as $sprintID => $sprint):?>
<tr>
<td><?php echo "{$lang->projectCommon} #{$project->id} {$project->name}" . html::hidden("projects[]", $project->id);?></td>
<td><?php echo "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}" . html::hidden("sprints[]", $sprint->id);?></td>
<td class='divider'><i class='icon icon-angle-double-right'></i></td>
<td><?php echo html::select("programs[]", $project->programs, '', "class='form-control chosen'");?></td>
<td><?php echo html::select("projects[]", $sprint->projects, '', "class='form-control chosen'");?></td>
</tr>
<?php endforeach;?>
</tbody>