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

* Fix bug #38151.

Browse Source
This commit is contained in:
zhaoke
2023-09-05 10:05:47 +08:00
parent 5fedb63afc
commit 9608b111e7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+1 -1
View File
@@ -842,7 +842,7 @@ class mrModel extends model
$host = $this->loadModel('pipeline')->getByID($hostID);
if($host->type == 'gitlab')
{
$url = sprintf($this->gitlab->getApiRoot($hostID), "/projects/$projectID/merge_requests/$MRID");
$url = sprintf($this->gitlab->getApiRoot($hostID, false), "/projects/$projectID/merge_requests/$MRID");
$MR = json_decode(commonModel::http($url));
}
elseif($host->type == 'gitea')
module/repo/config/dtable.php
+1 -1
View File
@@ -211,7 +211,7 @@ $config->repo->taskDtable->fieldList['finishedBy']['sortType'] = true;
$config->repo->taskDtable->fieldList['finishedBy']['show'] = true;
$config->repo->taskDtable->fieldList['finishedBy']['group'] = 4;
$config->repo->taskDtable->fieldList['assignedTo']['type'] = 'assign';
$config->repo->taskDtable->fieldList['assignedTo']['type'] = 'user';
$config->repo->taskDtable->fieldList['assignedTo']['sortType'] = true;
$config->repo->taskDtable->fieldList['assignedTo']['show'] = true;
$config->repo->taskDtable->fieldList['assignedTo']['group'] = 3;