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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
wangyidong
2021-08-05 14:05:38 +08:00
parent 1975cdb024 1a19103791
commit 17c6f4e24e
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ci/lang/en.php
+3 -2
View File
@@ -1,6 +1,7 @@
<?php
$lang->ci->common = 'CI';
$lang->ci->commitResult = 'Interface: Commit Test Result.';
$lang->ci->common = 'CI';
$lang->ci->commitResult = 'Interface: Commit Test Result.';
$lang->ci->checkCompileStatus = 'Interface: Fetch Test Result.';
$lang->ci->job = 'Job';
$lang->ci->task = 'Task';
module/ci/lang/zh-cn.php
+3 -2
View File
@@ -1,6 +1,7 @@
<?php
$lang->ci->common = '持续集成';
$lang->ci->commitResult = '接口：提交测试结果';
$lang->ci->common = '持续集成';
$lang->ci->commitResult = '接口：提交测试结果';
$lang->ci->checkCompileStatus = '接口：获取测试结果';
$lang->ci->job = '构建';
$lang->ci->task = '构建任务';
module/ci/lang/zh-tw.php
+3 -2
View File
@@ -1,6 +1,7 @@
<?php
$lang->ci->common = '持續整合';
$lang->ci->commitResult = '介面：提交測試結果';
$lang->ci->common = '持續整合';
$lang->ci->commitResult = '介面：提交測試結果';
$lang->ci->checkCompileStatus = '介面：獲取測試結果';
$lang->ci->job = '構建';
$lang->ci->task = '構建任務';
module/common/model.php
+1
View File
@@ -1997,6 +1997,7 @@ EOD;
{
$httpType = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http';
if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) and strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https') $httpType = 'https';
if(isset($_SERVER['REQUEST_SCHEME']) and strtolower($_SERVER['REQUEST_SCHEME']) == 'https') $httpType = 'https';
$httpHost = $_SERVER['HTTP_HOST'];
return "$httpType://$httpHost";
}
module/group/lang/resource.php
+6 -4
View File
@@ -977,9 +977,11 @@ $lang->repo->methodOrder[60] = 'download';
$lang->repo->methodOrder[65] = 'setRules';
$lang->resource->ci = new stdclass();
$lang->resource->ci->commitResult = 'commitResult';
$lang->resource->ci->commitResult = 'commitResult';
$lang->resource->ci->checkCompileStatus = 'checkCompileStatus';
$lang->ci->methodOrder[5] = 'commitResult';
$lang->ci->methodOrder[5] = 'commitResult';
$lang->ci->methodOrder[10] = 'checkCompileStatus';
$lang->resource->compile = new stdclass();
$lang->resource->compile->browse = 'browse';
@@ -1133,7 +1135,7 @@ $lang->resource->gitlab->importIssue = 'importIssue';
$lang->resource->gitlab->delete = 'delete';
$lang->resource->gitlab->bindUser = 'bindUser';
$lang->resource->gitlab->bindProduct = 'bindProduct';
$lang->resource->gitlab->webhook = 'webhook';
//$lang->resource->gitlab->webhook = 'webhook';
$lang->gitlab->methodOrder[5] = 'browse';
$lang->gitlab->methodOrder[10] = 'create';
@@ -1142,7 +1144,7 @@ $lang->gitlab->methodOrder[20] = 'importIssue';
$lang->gitlab->methodOrder[30] = 'delete';
$lang->gitlab->methodOrder[35] = 'bindUser';
$lang->gitlab->methodOrder[40] = 'bindProduct';
$lang->gitlab->methodOrder[45] = 'webhook';
//$lang->gitlab->methodOrder[45] = 'webhook';
/* Git. */
$lang->resource->git = new stdclass();
module/upgrade/control.php
-2
View File
@@ -582,8 +582,6 @@ class upgrade extends control
if(empty($repos))
{
$this->dao->delete()->from(TABLE_BLOCK)->exec();
$this->dao->delete()->from(TABLE_CONFIG)->where('`key`')->eq('blockInited')->exec();
$this->loadModel('setting')->deleteItems('owner=system&module=common&section=global&key=upgradeStep');
die(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=no")));
}