From 9f3e951085dd28730f0310cd047779373bbeb53b Mon Sep 17 00:00:00 2001 From: liyang Date: Fri, 15 Mar 2024 09:10:42 +0800 Subject: [PATCH] * Adjust repo data in edit form. --- module/repo/zen.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/module/repo/zen.php b/module/repo/zen.php index 3fadaecd71..5227170be8 100644 --- a/module/repo/zen.php +++ b/module/repo/zen.php @@ -413,7 +413,10 @@ class repoZen extends repo $products = $this->loadModel('product')->getPairs('', 0, '', 'all'); } - $serviceHosts = $this->loadModel('gitlab')->getPairs(); + $gitlabHosts = $this->loadModel('gitlab')->getPairs(); + $gitfoxHosts = $this->loadModel('gitfox')->getPairs(); + $serviceHosts = array_merge($gitlabHosts, $gitfoxHosts); + $repoGroups = array(); if(!empty($serviceHosts)) @@ -455,11 +458,20 @@ class repoZen extends repo if(in_array($scm, $this->config->repo->gitServiceList)) { $serviceID = isset($repo->gitService) ? $repo->gitService : 0; - $projects = $this->loadModel($scm)->apiGetProjects($serviceID); + if($scm == 'gitfox') + { + $projects = $this->loadModel($scm)->apiGetRepos($serviceID); + } + else + { + $projects = $this->loadModel($scm)->apiGetProjects($serviceID); + } + $options = array(); foreach($projects as $project) { if($scm == 'gitlab') $options[$project->id] = $project->name_with_namespace; + if($scm == 'gitfox') $options[$project->id] = $project->path; if($scm == 'gitea') $options[$project->full_name] = $project->full_name; if($scm == 'gogs') $options[$project->full_name] = $project->full_name; }