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

Merge branch 'devops17_46005' into 'devops17'

Browse Source 
* Finish task#46005

See merge request easycorp/zentaopms!1051
This commit is contained in:
李玉春
2021-12-22 03:00:47 +00:00
parent 71df92bee6 cb1c14b98b
commit 7d8dbf5db8
3 changed files with 60 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ci/model.php
+52 -2
View File
@@ -162,8 +162,58 @@ class ciModel extends model
$relateMR = $this->dao->select('*')->from(TABLE_MR)->where('compileID')->eq($compile->id)->fetch();
if($relateMR)
{
if($data->status == 'success') $this->loadModel('action')->create('mr', $relateMR->id, 'compilePass');
if($data->status == 'failed') $this->loadModel('action')->create('mr', $relateMR->id, 'compileFail');
if($data->status == 'success')
{
$this->loadModel('action')->create('mr', $relateMR->id, 'compilePass');
if($relateMR->synced == '0')
{
$newMR = new stdclass();
$newMR->mergeStatus = 'can_be_merged';
/* Create a gitlab mr. */
$MRObject = new stdclass();
$MRObject->target_project_id = $relateMR->targetProject;
$MRObject->source_branch = $relateMR->sourceBranch;
$MRObject->target_branch = $relateMR->targetBranch;
$MRObject->title = $relateMR->title;
$MRObject->description = $relateMR->description;
$MRObject->remove_source_branch = $relateMR->removeSourceBranch == '1' ? true : false;
if($relateMR->assignee)
{
$gitlabAssignee = $this->gitlab->getUserIDByZentaoAccount($relateMR->gitlabID, $relateMR->assignee);
if($gitlabAssignee) $MRObject->assignee_ids = $gitlabAssignee;
}
$rawMR = $this->loadModel('mr')->apiCreateMR($relateMR->gitlabID, $relateMR->sourceProject, $MRObject);
if(!empty($rawMR->iid))
{
$newMR->mriid = $rawMR->iid;
$newMR->status = $rawMR->state;
$newMR->synced = '1';
}
$this->dao->update(TABLE_MR)->data($newMR)
->where('id')->eq($relateMR->id)
->exec();
}
}
if($data->status == 'failed')
{
$this->loadModel('action')->create('mr', $relateMR->id, 'compileFail');
if($relateMR->synced == '0')
{
$newMR = new stdclass();
$newMR->mergeStatus = 'cannot_merge_by_fail';
$this->dao->update(TABLE_MR)->data($newMR)
->where('id')->eq($relateMR->id)
->exec();
}
}
}
}
module/mr/lang/en.php
+4 -3
View File
@@ -79,9 +79,10 @@ $lang->mr->statusList['merged'] = 'merged';
$lang->mr->statusList['closed'] = 'closed';
$lang->mr->mergeStatusList = array();
$lang->mr->mergeStatusList['checking'] = 'checking';
$lang->mr->mergeStatusList['can_be_merged'] = 'can be merged';
$lang->mr->mergeStatusList['cannot_be_merged'] = 'cannot be merged';
$lang->mr->mergeStatusList['checking'] = 'checking';
$lang->mr->mergeStatusList['can_be_merged'] = 'can be merged';
$lang->mr->mergeStatusList['cannot_be_merged'] = 'cannot be merged';
$lang->mr->mergeStatusList['cannot_merge_by_fail'] = 'Cannot be merged, check failed';
$lang->mr->description = 'Description';
$lang->mr->confirmDelete = 'Are you sure to delete this merge request?';
module/mr/lang/zh-cn.php
+4 -3
View File
@@ -79,9 +79,10 @@ $lang->mr->statusList['merged'] = '已合并';
$lang->mr->statusList['closed'] = '已关闭';
$lang->mr->mergeStatusList = array();
$lang->mr->mergeStatusList['checking'] = '检查中';
$lang->mr->mergeStatusList['can_be_merged'] = '可合并';
$lang->mr->mergeStatusList['cannot_be_merged'] = '不可自动合并';
$lang->mr->mergeStatusList['checking'] = '检查中';
$lang->mr->mergeStatusList['can_be_merged'] = '可合并';
$lang->mr->mergeStatusList['cannot_be_merged'] = '不可自动合并';
$lang->mr->mergeStatusList['cannot_merge_by_fail'] = '不可合并,检查未通过';
$lang->mr->description = '描述';
$lang->mr->confirmDelete = '确认删除该合并请求吗？';