* Fix delete mr error.

This commit is contained in:
Guan Xiying
2021-08-23 17:04:51 +08:00
parent 581791948c
commit 7ccb99423b
+13 -6
View File
@@ -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);
}
}