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

* Fix browe mr page.

Browse Source
This commit is contained in:
Guan Xiying
2021-08-23 14:15:55 +08:00
parent a04e1a0cb8
commit f0ed277adb
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/lang/zh-cn.php
+11
View File
@@ -6,6 +6,8 @@ $lang->mr->list = $lang->mr->browse;
$lang->mr->edit = "编辑{$lang->mr->common}";
$lang->mr->delete = "删除{$lang->mr->common}";
$lang->mr->view = "详情";
$lang->mr->source = '源项目分支';
$lang->mr->target = '目标项目分支';
$lang->mr->id = 'ID';
$lang->mr->iid = "MR原始ID";
@@ -17,6 +19,15 @@ $lang->mr->reviewer = '评审人';
$lang->mr->link = 'GitLab链接';
$lang->mr->canMerge = '是否可合并';
$lang->mr->statusList = array();
$lang->mr->statusList['opened'] = '开放中';
$lang->mr->statusList['closed'] = '已关闭';
$lang->mr->statusList['merged'] = '已合并';
$lang->mr->canMergeStatusList = array();
$lang->mr->canMergeStatusList['can_be_merged'] = '可合并';
$lang->mr->canMergeStatusList['cannot_be_merged'] = '不可合并';
$lang->mr->description = '描述';
$lang->mr->confirmDelete = '确认删除该merge request吗？';
$lang->mr->sourceProject = '源项目';
module/mr/view/browse.html.php
+4 -4
View File
@@ -37,11 +37,11 @@
<td class='text'><?php echo $mr->id; ?></td>
<td class='text'><?php echo $mr->name; ?></td>
<td class='text'><?php echo $this->loadModel('gitlab')->apiGetSingleProject($mr->gitlabID, $mr->sourceProject)->name_with_namespace; ?></td>
<td class='text'><?php echo $mr->sourceBranch; ?></td>
<td class='text'><?php echo $mr->sourceBranch;?></td>
<td class='text'><?php echo $this->loadModel('gitlab')->apiGetSingleProject($mr->gitlabID, $mr->targetProject)->name_with_namespace; ?></td>
<td class='text'><?php echo $mr->targetBranch; ?></td>
<td class='text'><?php echo $mr->status; ?></td>
<td class='text'><?php echo $mr->canMerge; ?></td>
<td class='text'><?php echo $mr->targetBranch;?></td>
<td class='text'><?php echo zget($lang->mr->statusList, $mr->status);?></td>
<td class='text'><?php echo zget($lang->mr->canMergeStatusList, $mr->canMerge);?></td>
<td class='text-left c-actions'>
<?php
common::printLink('mr', 'list', "mr={$mr->id}", '<i class="icon icon-review"></i>', '', "title='{$lang->mr->list}' class='btn btn-info'");