diff --git a/config/zentaopms.php b/config/zentaopms.php index 476ae5d778..1b94bfc23c 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -113,6 +113,9 @@ $config->hourPointCommonList['vi'][0] = 'giờ'; $config->hourPointCommonList['vi'][1] = 'điểm'; $config->hourPointCommonList['vi'][2] = 'function point'; +$config->manualUrl['home'] = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; +$config->manualUrl['int'] = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html?fullScreen=zentao'; + /* Supported charsets. */ $config->charsets['zh-cn']['utf-8'] = 'UTF-8'; $config->charsets['zh-cn']['gbk'] = 'GBK'; diff --git a/db/update12.3.3.sql b/db/update12.3.3.sql new file mode 100644 index 0000000000..3a21df8a26 --- /dev/null +++ b/db/update12.3.3.sql @@ -0,0 +1 @@ +ALTER TABLE `zt_doccontent` CHANGE `content` `content` longtext NOT NULL AFTER `digest`; diff --git a/module/bug/control.php b/module/bug/control.php index 90b51ebd5f..a27b5ff705 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -638,7 +638,7 @@ class bug extends control } if($this->post->comment != '' or !empty($changes) or !empty($files)) { - $action = !empty($changes) ? 'Edited' : 'Commented'; + $action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented'; $fileAction = ''; if(!empty($files)) $fileAction = $this->lang->addFiles . join(',', $files) . "\n" ; $actionID = $this->action->create('bug', $bugID, $action, $fileAction . $this->post->comment); diff --git a/module/ci/model.php b/module/ci/model.php index 99bb5da5da..444404042d 100644 --- a/module/ci/model.php +++ b/module/ci/model.php @@ -84,9 +84,7 @@ class ciModel extends model $queueInfo = json_decode($response); if(!empty($queueInfo->executable)) { - $buildUrl = $queueInfo->executable->url . 'api/json?pretty=true'; - $buildUrl = str_replace('://', $jenkinsAuth, $buildUrl); - + $buildUrl = $queueInfo->executable->url . 'api/json?pretty=true'; $response = common::http($buildUrl, '', false, $userPwd); $buildInfo = json_decode($response); @@ -100,7 +98,6 @@ class ciModel extends model $this->updateBuildStatus($compile, $result); $logUrl = $buildInfo->url . 'logText/progressiveText/api/json'; - $logUrl = str_replace('://', $jenkinsAuth, $logUrl); $response = common::http($logUrl, '', false, $userPwd); $this->dao->update(TABLE_COMPILE)->set('logs')->eq($response)->where('id')->eq($compile->id)->exec(); } diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 04a8f57fd9..40f4af6fe9 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -86,7 +86,6 @@ $lang->homepage = 'Als Startseite setzen'; $lang->noviceTutorial = 'Anleitung'; $lang->changeLog = 'Änderungsprotokoll'; $lang->manual = 'Handbuch'; -$lang->manualUrl = 'http://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; $lang->customMenu = 'Benutzer Menü'; $lang->customField = 'Individualfeld'; $lang->lineNumber = 'Zeile Nr.'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 86bac80496..81d53ed0df 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -86,7 +86,6 @@ $lang->homepage = 'Set Home'; $lang->noviceTutorial = 'ZenTao Tutorial'; $lang->changeLog = 'Change Log'; $lang->manual = 'User Manual'; -$lang->manualUrl = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html'; $lang->customMenu = 'Custom Menu'; $lang->customField = 'Custom Field'; $lang->lineNumber = 'Line No.'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index ca726018f9..7dfdacd0e3 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -86,7 +86,6 @@ $lang->homepage = 'Set Home'; $lang->noviceTutorial = 'Tutoriel ZenTao'; $lang->changeLog = 'Change Log'; $lang->manual = 'User Manual'; -$lang->manualUrl = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html'; $lang->customMenu = 'Personnalisation Menu'; $lang->customField = 'Personnalisation Champ'; $lang->lineNumber = 'Ligne No.'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 443f355ece..60cf0134d8 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -86,7 +86,6 @@ $lang->homepage = 'Trang thiết lập'; $lang->noviceTutorial = 'Hướng dẫn ZenTao'; $lang->changeLog = 'Thay đổi nhật ký'; $lang->manual = 'Hướng dẫn người dùng'; -$lang->manualUrl = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html'; $lang->customMenu = 'Tùy biến Menu'; $lang->customField = 'Tùy biến trường'; $lang->lineNumber = 'Số dòng'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 7acc235484..0e188fcdf1 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -86,7 +86,6 @@ $lang->homepage = '设为模块首页'; $lang->noviceTutorial = '新手教程'; $lang->changeLog = '修改日志'; $lang->manual = '手册'; -$lang->manualUrl = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; $lang->customMenu = '自定义导航'; $lang->customField = '自定义表单项'; $lang->lineNumber = '行号'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 1599e01c53..393185028a 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -86,7 +86,6 @@ $lang->homepage = '設為模組首頁'; $lang->noviceTutorial = '新手教程'; $lang->changeLog = '修改日誌'; $lang->manual = '手冊'; -$lang->manualUrl = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; $lang->customMenu = '自定義導航'; $lang->customField = '自定義表單項'; $lang->lineNumber = '行號'; diff --git a/module/common/model.php b/module/common/model.php index 440a851fea..e67ab4a9b0 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -325,7 +325,10 @@ class commonModel extends model echo "" . $lang->help . ""; echo "
\n"; echo '