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

* Adjust git service check rule.

Browse Source
This commit is contained in:
caoyanyi
2023-11-03 10:11:23 +08:00
parent 1d25374670
commit ad2da1e0d5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+3 -3
View File
@@ -67,7 +67,7 @@ class mr extends control
$repoID = $this->loadModel('repo')->saveState($repoID, $objectID);
$repo = $this->repo->getByID($repoID);
if(!in_array(strtolower($repo->SCM), $this->config->mr->gitServiceList))
if(!in_array($repo->SCM, $this->config->mr->gitServiceTypeList))
{
$repoID = $this->dao->select('id')->from(TABLE_REPO)->where('deleted')->eq('0')->andWhere('SCM')->in(array('Gitlab', 'Gitea', 'Gogs'))->andWhere('synced')->eq(1)->orderBy('id')->fetch('id');
$repo = $this->repo->getByID($repoID);
@@ -177,7 +177,7 @@ class mr extends control
$repoPairs = array($this->lang->repo->common);
foreach($repoList as $repo)
{
if(!in_array($repo->SCM, $this->config->repo->gitServiceList)) continue;
if(!in_array($repo->SCM, $this->config->repo->gitServiceTypeList)) continue;
$repoPairs[$repo->id] = $repo->name;
if($repoID && $repoID != $repo->id) continue;
@@ -255,7 +255,7 @@ class mr extends control
$repoList = $this->loadModel('repo')->getList($objectID);
foreach($repoList as $repoInfo)
{
if(in_array($repo->SCM, $this->config->repo->gitServiceList)) $repoPairs[$repoInfo->id] = $repoInfo->name;
if(in_array($repo->SCM, $this->config->repo->gitServiceTypeList)) $repoPairs[$repoInfo->id] = $repoInfo->name;
}
}
module/mr/ui/browsebyexecution.html.php
+1 -1
View File
@@ -73,7 +73,7 @@ $repoData = array(array(
));
foreach($repoList as $repo)
{
if(!in_array($repo->SCM, $this->config->repo->gitServiceList)) continue;
if(!in_array($repo->SCM, $this->config->repo->gitServiceTypeList)) continue;
$repoData[] = array(
'text' => $repo->name,