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

* Fix bug #25152.

Browse Source
This commit is contained in:
caoyanyi
2022-07-14 15:31:26 +08:00
parent 02487dc133
commit 8051256ee9
7 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/scm/gitea.class.php
+3 -3
View File
@@ -503,8 +503,8 @@ class gitea
if(!empty($version) and $count == 1)
{
$api .= '/' . $version;
$commit = $this->fetch($api, array('limit' => 1));
$commits = $this->fetch($api, array('limit' => 1, 'sha' => $version));
$commit = $commits[0];
if(isset($commit->sha))
{
$log = new stdclass;
@@ -789,6 +789,6 @@ class gitea
{
$params['token'] = $this->token;
return "{$this->root}archive/{$branch}.{$ext}" . '?' . http_build_query($params);
return "{$this->root}archive/" . urlencode($branch) . ".{$ext}" . '?' . http_build_query($params);
}
}
module/gitea/lang/de.php
+3 -2
View File
@@ -24,8 +24,9 @@ $lang->gitea->name = "Server Name";
$lang->gitea->url = 'Server URL';
$lang->gitea->token = 'Token';
$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
$lang->gitea->hostError = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
$lang->gitea->hostError = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
$lang->gitea->bindUserError = "Can not bind users repeatedly %s";
$lang->gitea->server = "Server List";
$lang->gitea->lblCreate = 'Create Gitea Server';
module/gitea/lang/en.php
+3 -2
View File
@@ -24,8 +24,9 @@ $lang->gitea->name = "Server Name";
$lang->gitea->url = 'Server URL';
$lang->gitea->token = 'Token';
$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
$lang->gitea->hostError = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
$lang->gitea->hostError = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
$lang->gitea->bindUserError = "Can not bind users repeatedly %s";
$lang->gitea->server = "Server List";
$lang->gitea->lblCreate = 'Create Gitea Server';
module/gitea/lang/fr.php
+3 -2
View File
@@ -24,8 +24,9 @@ $lang->gitea->name = "Server Name";
$lang->gitea->url = 'Server URL';
$lang->gitea->token = 'Token';
$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
$lang->gitea->hostError = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
$lang->gitea->hostError = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
$lang->gitea->bindUserError = "Can not bind users repeatedly %s";
$lang->gitea->server = "Server List";
$lang->gitea->lblCreate = 'Create Gitea Server';
module/gitea/lang/vi.php
+3 -2
View File
@@ -24,8 +24,9 @@ $lang->gitea->name = "Server Name";
$lang->gitea->url = 'Server URL';
$lang->gitea->token = 'Token';
$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
$lang->gitea->hostError = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
$lang->gitea->tokenLimit = "The current token has no admin privilege. Please regenerate one with root user in Gitea.";
$lang->gitea->hostError = "So the current Gitea server address is invalid, please confirm that the current server can be accessed and try again.";
$lang->gitea->bindUserError = "Can not bind users repeatedly %s";
$lang->gitea->server = "Server List";
$lang->gitea->lblCreate = 'Create Gitea Server';
module/gitea/lang/zh-cn.php
+3 -2
View File
@@ -24,8 +24,9 @@ $lang->gitea->name = "服务器名称";
$lang->gitea->url = '服务器地址';
$lang->gitea->token = 'Token';
$lang->gitea->tokenLimit = "Gitea Token权限不足。";
$lang->gitea->hostError = "当前Gitea服务器地址无效，请确认当前服务器可被访问";
$lang->gitea->tokenLimit = "Gitea Token权限不足。";
$lang->gitea->hostError = "当前Gitea服务器地址无效，请确认当前服务器可被访问";
$lang->gitea->bindUserError = "不能重复绑定用户 %s";
$lang->gitea->server = "服务器列表";
$lang->gitea->lblCreate = '添加Gitea服务器';
module/gitea/model.php
+1
View File
@@ -113,6 +113,7 @@ class giteaModel extends model
*/
public function bindUser($giteaID)
{
$userPairs = $this->loadModel('user')->getPairs('noclosed|noletter');
$users = $this->post->zentaoUsers;
$giteaNames = $this->post->giteaUserNames;
$accountList = array();