From 7ccb99423b5762ce5d5ce1b7c579961330dcf79f Mon Sep 17 00:00:00 2001
From: Guan Xiying <guanxiying@easycorp.ltd>
Date: Mon, 23 Aug 2021 17:04:51 +0800
Subject: [PATCH] * Fix delete mr error.

---
 module/mr/control.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/module/mr/control.php b/module/mr/control.php
index 305d671217..ae41cf7adb 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -71,9 +71,9 @@ class mr extends control
     }
 
     /**
-     * Delete a mr.
+     * Delete a MR.
      *
-     * @param  int    $MR
+     * @param  int    $id
      * @access public
      * @return void
      */
@@ -81,11 +81,12 @@ class mr extends control
     {
         if($confim != 'yes') die(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
 
-        $MRList = $this->mr->getByID($id);
+        $MR = $this->mr->getByID($id);
 
-        $this->mr->apiDeleteMR($MRList->gitlabID, $MRList->projectID, $MRList->mrID);
-        $this->mr->deleteMR($id);
-        die(js::reload('parent'));
+        $this->dao->delete()->from(TABLE_MR)->where('id')->eq($id)->exec();
+        $this->mr->apiDeleteMR($MR->gitlabID, $MR->sourceProject, $MR->mriid);
+
+        die(js::locate(inlink('browse'), 'parent'));
     }
 
     /**
@@ -125,4 +126,10 @@ class mr extends control
 
         $this->send($options);
     }
+
+    public function diff($MRID)
+    {
+        $MR = $this->mr->getByID($MRID);
+        $versions = $this->mr->apiGetDiffVersions($MR);
+    }
 }