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

Merge branch 'devops21_liyuchun' into 'devops21'

Browse Source 
Fix bug #19455,19438.

See merge request easycorp/zentaopms!1767
This commit is contained in:
孙广明
2022-02-11 08:04:48 +00:00
parent 12847ab38e 42619874a2
commit d5a459cabd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+2 -2
View File
@@ -198,7 +198,7 @@ $lang->action->desc->importedproductplan = '$date, imported to <strong>$extra</
$lang->action->desc->importedrelease = '$date, imported to <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->importedexecution = '$date, imported to <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->importedbuild = '$date, imported to <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->fromsonarqube = '$date, by <strong>$actor</strong> turn from <strong>SonarQube Issue</strong>.' . "\n";
$lang->action->desc->fromsonarqube = '$date, created by <strong>$actor</strong> from <strong>SonarQube Issue</strong>.' . "\n";
/* Used to describe the history of operations related to parent-child tasks. */
$lang->action->desc->createchildren = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
@@ -343,7 +343,7 @@ $lang->action->label->importedproductplan = 'imported';
$lang->action->label->importedrelease = 'imported';
$lang->action->label->importedexecution = 'imported';
$lang->action->label->importedbuild = 'imported';
$lang->action->label->fromsonarqube = 'from SonarQube Issue';
$lang->action->label->fromsonarqube = 'created a bug from SonarQube Issue named:';
/* Dynamic information is grouped by object. */
$lang->action->dynamicAction = new stdclass;
module/my/view/bug.html.php
+1 -1
View File
@@ -109,7 +109,7 @@
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
<td class="text-center"><span class='<?php echo $bug->confirmed == '1' ? 'confirmed' : 'unconfirmed';?>' title='<?php echo zget($lang->bug->confirmedList, $bug->confirmed);?>'><?php echo zget($lang->bug->confirmedList, $bug->confirmed)?></span></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color' title={$bug->title}");?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color' title='{$bug->title}'");?></td>
<?php $param = $config->productLink == 'product-all' ? '' : "productID=$bug->product";?>
<td class='text-left nobr'>
<?php