Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

erge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR

Browse Source
This commit is contained in:
dingguodong
2021-08-20 15:16:46 +08:00
parent 08aff43f08 773ac9ef95
commit f5e2f780f4
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+7 -3
View File
@@ -74,10 +74,14 @@ class mr extends control
* @access public
* @return void
*/
public function delete($MR, $confim = 'no')
public function delete($id, $confim = 'no')
{
if($confim != 'yes') die(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "productID=$projectID&gitlabID=$gitlabID&MR=$MR&confirm=yes")));
$this->mr->apiDeleteMR($MR);
if($confim != 'yes') die(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
$MRList = $this->mr->getByID($id);
$this->mr->apiDeleteMR($MRList->gitlabID, $MRList->projectID, $MRList->mrID);
$this->mr->deleteMR($id);
die(js::reload('parent'));
}