From 1b2d102591abfc5887b115da7cc7a32c0af29af7 Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycorp.ltd>
Date: Mon, 20 May 2024 15:48:19 +0800
Subject: [PATCH] * The merged mr does not display the merge button.

---
 module/mr/ui/actions.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/mr/ui/actions.html.php b/module/mr/ui/actions.html.php
index ca56e7147d..b893835ff1 100644
--- a/module/mr/ui/actions.html.php
+++ b/module/mr/ui/actions.html.php
@@ -20,7 +20,7 @@ foreach($config->mr->view->operateList as $operate)
 {
     if(!common::hasPriv('mr', $operate == 'reject' ? 'approval' : $operate)) continue;
     if($operate == 'reopen' && (!$MR->synced || $rawMR->state != 'closed')) continue;
-    if($rawMR->state == 'closed' && $operate == 'accept') continue;
+    if(in_array($rawMR->state, array('closed', 'merged')) && $operate == 'accept') continue;
 
     $action = $config->mr->actionList[$operate];
     if($operate === 'edit' || $operate === 'delete')