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

* Update processMR function and bug fix.

Browse Source
This commit is contained in:
dingguodong
2021-08-20 16:29:54 +08:00
parent 0a8c4b40f1
commit e7089866bc
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
@@ -70,9 +70,10 @@ class mrModel extends model
$rawMR = $this->apiGetSingleMR($MR->gitlabID, $MR->projectID, $MR->mrID);
$MR->name = $rawMR->title;
$MR->targetBranch = $rawMR->target_branch;
$MR->sourceProject = $rawMR->source_project_id;
$MR->sourceBranch = $rawMR->source_branch;
$MR->targetProject = $rawMR->target_project_id;
$MR->targetBranch = $rawMR->target_branch;
$MR->canMerge = $rawMR->merge_status;
$MR->status = $rawMR->state;
return $MR;
@@ -141,7 +142,7 @@ class mrModel extends model
$MR = fixer::input('post')
->add('repoID', 0)
->add('gitlabID', $gitlabID)
->add('projectID', $projectID)
->add('projectID', $rawMR->project_id) /* sourceProject can be not project of the created MR. */
->add('mrID', $rawMR->iid)
->add('createdBy', $this->app->user->account)
->add('createdDate', helper::now())