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

Merge branch release/21.7.6 of zentao/zentaopms (#11665)

Browse Source
This commit is contained in:
刘刚
2025-09-25 14:48:43 +08:00
committed by Gitfox
parent b151423a69 a9f1cc8b7d
commit 634d96753b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/compile/config/dtable.php
+1 -1
View File
@@ -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;
module/repo/control.php
+2 -1
View File
@@ -1096,7 +1096,8 @@ class repo extends control
$server = $this->pipeline->getByID($serverID);
$hiddenRepos = $this->loadModel('setting')->getItem('owner=system&module=repo&section=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;