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

* Fix bug #32934.

Browse Source
This commit is contained in:
zhaoke
2023-10-10 09:26:26 +08:00
parent b6b2da4c90
commit 5657d5753b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+4 -4
View File
@@ -762,11 +762,12 @@ class mrModel extends model
}
$response = json_decode(commonModel::http($url, $data = null, $options = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false));
if(empty($response)) $response = array();
if(empty($response) || isset($response->message)) $response = array();
if($scm == 'Gitea')
{
foreach($response as $MR)
{
if(empty($MR)) continue;
$MR->iid = $MR->number;
$MR->state = $MR->state == 'open' ? 'opened' : $MR->state;
if($MR->merged) $MR->state = 'merged';
@@ -946,11 +947,11 @@ class mrModel extends model
$newMR->squash = $MR->squash == '1' ? 1 : 0;
if($MR->assignee)
{
$gitlabAssignee = $this->gitlab->getUserIDByZentaoAccount($MR->hostID, $MR->assignee);
$gitlabAssignee = $this->gitlab->getUserIDByZentaoAccount($hostID, $MR->assignee);
if($gitlabAssignee) $newMR->assignee_ids = $gitlabAssignee;
}
$url = sprintf($this->gitlab->getApiRoot($hostID), "/projects/$projectID/merge_requests/$MRID");
return json_decode(commonModel::http($url, $MR, $options = array(CURLOPT_CUSTOMREQUEST => 'PUT')));
return json_decode(commonModel::http($url, $newMR, $options = array(CURLOPT_CUSTOMREQUEST => 'PUT')));
}
else
{
@@ -963,7 +964,6 @@ class mrModel extends model
$assignee = $this->{$host->type}->getUserIDByZentaoAccount($this->post->hostID, $MR->assignee);
if($assignee) $newMR->assignee = $assignee;
}
$mergeResult = json_decode(commonModel::http($url, $newMR, array(), array(), 'json', 'PATCH'));
if(isset($mergeResult->number)) $mergeResult->iid = $host->type == 'gitea' ? $mergeResult->number : $mergeResult->id;
if(isset($mergeResult->mergeable))