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

* Sync MR in ZenTao database whatever status of MR in GitLab.

Browse Source
This commit is contained in:
dingguodong
2021-09-06 17:57:27 +08:00
parent a5ceffb6cf
commit 9d5c1de0ab
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+3 -2
View File
@@ -192,7 +192,8 @@ class mrModel extends model
{
$rawMR = $this->apiGetSingleMR($MR->gitlabID, $MR->targetProject, $MR->mriid);
if(isset($rawMR->iid) and $rawMR->state != 'merged')
/* Sync MR in ZenTao database whatever status of MR in GitLab. */
if(isset($rawMR->iid))
{
$map = $this->config->MR->maps->sync;
$gitlabUsers = $this->gitlab->getUserIdAccountPairs($MR->gitlabID);
@@ -239,7 +240,7 @@ class mrModel extends model
$rawMR = $this->apiGetSingleMR($MR->gitlabID, $MR->targetProject, $MR->mriid);
if(isset($rawMR->iid) and $rawMR->state != 'merged')
if(isset($rawMR->iid))
{
/* create gitlab mr todo to zentao todo */
$this->batchSyncTodo($MR->gitlabID, $MR->targetProject);