From 587dd38b63164a043d73bc4ca648b54c458bad68 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Tue, 31 Aug 2021 11:01:29 +0800
Subject: [PATCH] * Update MR view and lang.

---
 module/mr/lang/zh-cn.php     | 8 ++++++--
 module/mr/view/view.html.php | 7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 0498e9afd2..9a83adbd96 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -30,7 +30,7 @@ $lang->mr->statusList['merged'] = '已合并';
 $lang->mr->mergeStatusList = array();
 $lang->mr->mergeStatusList['checking']         = '检查中';
 $lang->mr->mergeStatusList['can_be_merged']    = '可合并';
-$lang->mr->mergeStatusList['cannot_be_merged'] = '不可合并';
+$lang->mr->mergeStatusList['cannot_be_merged'] = '不可自动合并';
 
 $lang->mr->description   = '描述';
 $lang->mr->confirmDelete = '确认删除该合并请求吗？';
@@ -68,6 +68,10 @@ $lang->mr->hasConflicts   = "存在合并冲突";
 $lang->mr->hasNoConflict  = "可以合并请求";
 $lang->mr->mergeByManual  = "此合并请求可以手动合并，请使用以下";
 $lang->mr->commandLine    = "合并命令";
+$lang->mr->acceptMR       = "合并";
+$lang->mr->mergeFailed    = "无法合并，请核对合并请求状态";
+$lang->mr->mergeSuccess   = "已成功合并";
+
 
 /**
  * Merge Command Document.
@@ -80,7 +84,7 @@ $lang->mr->commandLine    = "合并命令";
  * %s mr::target_branch
  */
 $lang->mr->commandDocument = <<< EOD
-<div class='detail-title'>在本地检出、审核和合并</div>
+<div class='detail-title'>在本地检出、审核和手动合并</div>
 <div class='detail-content'>
   <p>
     第 1 步. 获取并查看此合并请求的分支
diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php
index b5f7c68ca4..89cada7c09 100644
--- a/module/mr/view/view.html.php
+++ b/module/mr/view/view.html.php
@@ -29,6 +29,9 @@
             <div><?php echo $lang->mr->from . html::a($sourceProjectURL, $sourceProjectName . ":" . $MR->sourceBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'") . $lang->mr->to . html::a($targetProjectURL, $targetProjectName . ":" . $MR->targetBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'");?></div>
           </div>
           <div class="detail-content article-content">
+            <strong><?php echo $lang->mr->status;?></strong>
+            <?php echo zget($lang->mr->statusList, $MR->status);?>
+            <br>
             <?php if(isset($rawMR->head_pipeline->status)):?>
               <div>
                 <strong><?php echo "{$lang->mr->pipeline}{$lang->mr->status}";?></strong>
@@ -51,8 +54,12 @@
           </div>
         </div>
       </div>
+      <?php if($rawMR->state == 'opened'):?>
       <div class="cell"><?php echo sprintf($lang->mr->commandDocument, $httpRepoURL, $MR->sourceBranch, $branchPath, $MR->targetBranch, $branchPath, $MR->targetBranch);?></div>
+      <?php endif;?>
     </div>
   </div>
+  <br>
+  <?php if($rawMR->state == 'opened' and !$rawMR->has_conflicts) echo html::linkButton('<i class="icon icon-checked"></i> ' . $lang->mr->acceptMR, inlink( 'accept', "mr=$MR->id"), 'self', '', 'btn btn-wide btn-primary');?>
 <?php endif;?>
 <?php include '../../common/view/footer.html.php';?>