From 2acf4c98db142dcd5bd6e598f4ad7d6eea39fe31 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Thu, 4 Nov 2021 10:21:17 +0800
Subject: [PATCH] * Optimize merge request status in view page of MR module.

---
 module/mr/view/view.html.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php
index cbc02d1221..d32e1b0967 100644
--- a/module/mr/view/view.html.php
+++ b/module/mr/view/view.html.php
@@ -39,10 +39,15 @@
               </div>
             <?php endif;?>
             <strong><?php echo $lang->mr->mergeStatus;?> </strong>
-            <?php echo zget($lang->mr->mergeStatusList, $rawMR->merge_status);?>
+            <?php
+            if(empty($rawMR->changes_count)):
+              echo $lang->mr->noChanges;
+            else:
+              echo zget($lang->mr->mergeStatusList, $rawMR->merge_status);?>
             <br>
             <strong><?php echo $lang->mr->MRHasConflicts;?></strong>
             <?php echo ($rawMR->has_conflicts ? $lang->mr->hasConflicts : $lang->mr->hasNoConflict);?>
+            <?php endif;?>
           </div>
         </div>
       </div>