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

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

Browse Source
This commit is contained in:
Guan Xiying
2021-08-23 17:06:34 +08:00
parent 82ba7789b6 38f7285ff4
commit 1e26528ffe
8 changed files with 117 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+22 -8
View File
@@ -35,11 +35,8 @@ class mr extends control
{
if($_POST)
{
$rawMR = $this->mr->create();
if(isset($rawMR->message)) return $this->send(array('result' => 'fail', 'message' => $rawMR->message));
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
$result = $this->mr->create();
return $this->send($result);
}
$this->view->title = $this->lang->mr->create;
@@ -57,9 +54,8 @@ class mr extends control
{
if($_POST)
{
$this->mr->edit($MRID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
$result = $this->mr->edit($MRID);
return $result;
}
$MR = $this->mr->getByID($MRID);
@@ -89,6 +85,24 @@ class mr extends control
die(js::locate(inlink('browse'), 'parent'));
}
/**
* View a MR.
*
* @access public
* @return void
*/
public function view($id)
{
$MR = $this->mr->getByID($id);
if(isset($MR->gitlabID)) $rawMR = $this->mr->apiGetSingleMR($MR->gitlabID, $MR->projectID, $MR->mrID);
$this->view->title = $this->lang->mr->view;
$this->view->MR = $MR;
$this->view->rawMR = isset($rawMR) ? $rawMR : false;
$this->display();
}
/**
* AJAX: Get MR target projects.
*