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

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

Browse Source
This commit is contained in:
dingguodong
2021-06-29 16:10:48 +08:00
parent 701b817946 4e01b01a70
commit aaa61e8880
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+10
View File
@@ -803,6 +803,7 @@ class gitlabModel extends model
$map = $this->config->gitlab->maps->task;
$issue = new stdclass;
$gitlabUsers = $this->getUserAccountIdPairs($gitlabID);
foreach($map as $taskField => $config)
{
$value = '';
@@ -815,6 +816,11 @@ class gitlabModel extends model
}
if($value) $issue->$field = $value;
}
/* issue->state is null when creating it, we should put status_event when updating it. */
if(isset($issue->state) and $issue->state == 'closed') $issue->state_event='close';
if(isset($issue->state) and $issue->state == 'opened') $issue->state_event='reopen';
return $issue;
}
@@ -851,6 +857,10 @@ class gitlabModel extends model
if($value) $issue->$field = $value;
}
/* issue->state is null when creating it, we should put status_event when updating it. */
if(isset($issue->state) and $issue->state == 'closed') $issue->state_event='close';
if(isset($issue->state) and $issue->state == 'opened') $issue->state_event='reopen';
return $issue;
}