From 1321b1a3d90ef8a406fdec09ca7f3beddf860148 Mon Sep 17 00:00:00 2001 From: liyang Date: Thu, 25 Sep 2025 13:37:00 +0800 Subject: [PATCH 1/2] Revert "- [task#148300,done,1h,2h] DevOps pipeline execution log request exception" This reverts commit a2c9b5cd317b0541faa80f728ae88ad2049ff67b. --- module/compile/config/dtable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/compile/config/dtable.php b/module/compile/config/dtable.php index 4fd53f7c11..6211ddcd7d 100644 --- a/module/compile/config/dtable.php +++ b/module/compile/config/dtable.php @@ -60,7 +60,7 @@ $config->compile->actionList = array(); $config->compile->actionList['logs']['icon'] = 'file-log'; $config->compile->actionList['logs']['text'] = $lang->compile->logs; $config->compile->actionList['logs']['hint'] = $lang->compile->logs; -$config->compile->actionList['logs']['url'] = 'javascript:openPipelineLog({id})'; +$config->compile->actionList['logs']['url'] = array('module' => 'compile', 'method' => 'logs', 'params' => 'compileID={id}'); $config->compile->actionList['result']['icon'] = 'list-alt'; $config->compile->actionList['result']['text'] = $lang->compile->result; From a9f1cc8b7d3d45e85a30955498dcd9640233f400 Mon Sep 17 00:00:00 2001 From: liyang Date: Thu, 25 Sep 2025 14:46:38 +0800 Subject: [PATCH 2/2] * [task#150250] fix bug for import repo. --- module/repo/control.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/repo/control.php b/module/repo/control.php index 2b13d2061e..4df3e0dd68 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -1096,7 +1096,8 @@ class repo extends control $server = $this->pipeline->getByID($serverID); $hiddenRepos = $this->loadModel('setting')->getItem('owner=system&module=repo§ion=hiddenRepo&key=' . $serverID); - $repoList = $server ? $this->repoZen->getNotExistRepos($server) : array(); + $linkUser = $server ? $this->pipeline->getOpenIdByAccount($server->id, $server->type, $this->app->user->account) : array(); + $repoList = $server && $linkUser ? $this->repoZen->getNotExistRepos($server) : array(); $products = $this->loadModel('product')->getPairs('', 0, '', 'all'); $this->view->title = $this->lang->repo->common . $this->lang->hyphen . $this->lang->repo->importAction;