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

Merge branch 'devops18_18046' into 'devops18'

Browse Source 
* Fix bug#18046 and adjust code

See merge request easycorp/zentaopms!1199
This commit is contained in:
李玉春
2021-12-30 07:31:37 +00:00
parent 26621179fd fce6751316
commit 1c88e99c78
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/view/browsetagpriv.html.php
+1 -1
View File
@@ -29,7 +29,7 @@
</div>
</div>
<div class="btn-toolbar pull-right">
<?php if(common::hasPriv('gitlab', 'createTag')) common::printLink('gitlab', 'createTagPriv', "gitlabID=$gitlabID&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->gitlab->createTagPriv, '', "class='btn btn-primary'");?>
<?php common::printLink('gitlab', 'createTagPriv', "gitlabID=$gitlabID&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->gitlab->createTagPriv, '', "class='btn btn-primary'");?>
</div>
</div>
<?php if(empty($gitlabTagList)):?>
module/repo/model.php
+5 -1
View File
@@ -581,7 +581,11 @@ class repoModel extends model
if($entry == '/' or empty($entry))$comments->page($pager, 't1.id');
$comments = $comments->fetchAll('revision');
foreach($comments as $repoComment) $repoComment->comment = $this->replaceCommentLink($repoComment->comment);
foreach($comments as $repoComment)
{
$repoComment->originalComment = $repoComment->comment;
$repoComment->comment = $this->replaceCommentLink($repoComment->comment);
}
return $comments;
}
module/repo/view/ajaxsidecommits.html.php
+1 -2
View File
@@ -43,8 +43,7 @@ if(isset($entry)) $pathInfo .= '&type=file';
<?php endif;?>
<td><?php echo substr($log->time, 0, 10);?></td>
<td><?php echo $log->committer;?></td>
<?php $comment = htmlSpecialString($log->comment, ENT_QUOTES);?>
<td title='<?php echo $comment?>' class='comment'><?php echo $log->comment?></td>
<td title='<?php echo $log->originalComment?>' class='comment'><?php echo $log->comment?></td>
</tr>
<?php endforeach;?>
</tbody>