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

* Compatible to Gitea/Gogs. Transform the project to int ID only for gitlab and gitfox.

Browse Source
This commit is contained in:
dingguodong
2024-04-23 16:36:47 +08:00
parent ab56d6bd23
commit 22ca4dcdb7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+5 -5
View File
@@ -331,14 +331,14 @@ class mr extends control
$host = $this->loadModel('pipeline')->getByID($MR->hostID);
$projectOwner = false;
if($host->type == 'gitlab')
if(in_array(strtolower($host->type), array('gitlab', 'gitfox')))
{
$MR->sourceProject = (int)$MR->sourceProject;
$MR->targetProject = (int)$MR->targetProject;
}
$projectMethod = $host->type == 'gitfox' ? 'apiGetSingleRepo' : 'apiGetSingleProject';
$sourceProject = $this->loadModel($host->type)->$projectMethod($MR->hostID, (int)$MR->sourceProject);
$sourceProject = $this->loadModel($host->type)->$projectMethod($MR->hostID, $MR->sourceProject);
if(isset($MR->hostID) && !$this->app->user->admin)
{
$openID = $this->loadModel('pipeline')->getOpenIdByAccount($MR->hostID, $host->type, $this->app->user->account);
@@ -355,9 +355,9 @@ class mr extends control
$this->view->projectOwner = $projectOwner;
$this->view->projectEdit = $this->mrZen->checkProjectEdit($host->type, $sourceProject, $MR);
$this->view->sourceProject = $sourceProject;
$this->view->targetProject = $this->{$host->type}->$projectMethod($MR->hostID, (int)$MR->targetProject);
$this->view->sourceBranch = $this->mrZen->getBranchUrl($host, (int)$MR->sourceProject, $MR->sourceBranch);
$this->view->targetBranch = $this->mrZen->getBranchUrl($host, (int)$MR->targetProject, $MR->targetBranch);
$this->view->targetProject = $this->{$host->type}->$projectMethod($MR->hostID, $MR->targetProject);
$this->view->sourceBranch = $this->mrZen->getBranchUrl($host, $MR->sourceProject, $MR->sourceBranch);
$this->view->targetBranch = $this->mrZen->getBranchUrl($host, $MR->targetProject, $MR->targetBranch);
$this->display();
}