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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
holan20180123
2020-07-17 17:19:47 +08:00
parent f574524f3f 7768b040d4
commit 3cba60eb57
16 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/zentaopms.php
+3
View File
@@ -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';
db/update12.3.3.sql
+1
View File
@@ -0,0 +1 @@
ALTER TABLE `zt_doccontent` CHANGE `content` `content` longtext NOT NULL AFTER `digest`;
module/bug/control.php
+1 -1
View File
@@ -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);
module/ci/model.php
+1 -4
View File
@@ -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();
}
module/common/lang/de.php
-1
View File
@@ -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.';
module/common/lang/en.php
-1
View File
@@ -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.';
module/common/lang/fr.php
-1
View File
@@ -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.';
module/common/lang/vi.php
-1
View File
@@ -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';
module/common/lang/zh-cn.php
-1
View File
@@ -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 = '行号';
module/common/lang/zh-tw.php
-1
View File
@@ -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 = '行號';
module/common/model.php
+4 -1
View File
@@ -325,7 +325,10 @@ class commonModel extends model
echo "<a data-toggle='dropdown'>" . $lang->help . "</a>";
echo "<ul class='dropdown-menu pull-left'>";
if($config->global->flow == 'full' && !commonModel::isTutorialMode() and $app->user->account != 'guest') echo '<li>' . html::a(helper::createLink('tutorial', 'start'), $lang->noviceTutorial, '', "class='iframe' data-class-name='modal-inverse' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . "</li>";
echo '<li>' . html::a($lang->manualUrl, $lang->manual, '_blank', "class='open-help-tab'") . '</li>';
$manualUrl = (isset($config->isINT) and $config->isINT) ? $config->manualUrl['int'] : $config->manualUrl['home'];
echo '<li>' . html::a($manualUrl, $lang->manual, '_blank', "class='open-help-tab'") . '</li>';
echo '<li>' . html::a(helper::createLink('misc', 'changeLog'), $lang->changeLog, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '</li>';
echo "</ul></li>\n";
echo '<li>' . html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='1050' data-headerless='true' data-backdrop='true' data-keyboard='true' data-class='modal-about'") . '</li>';
module/jenkins/view/browse.html.php
+1 -1
View File
@@ -32,7 +32,7 @@
<td class='c-actions text-left'>
<?php
common::printIcon('jenkins', 'edit', "jenkinsID=$id", '', 'list', 'edit');
if(common::hasPriv('jenkins', 'delete')) echo html::a($this->createLink('jenkins', 'delete', "jenkinsID=$id"), '<i class="icon-trash"></i>', '', "title='{$lang->jenkins->delete}' class='btn'");
if(common::hasPriv('jenkins', 'delete')) echo html::a($this->createLink('jenkins', 'delete', "jenkinsID=$id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->jenkins->delete}' class='btn'");
?>
</td>
</tr>
module/job/model.php
+1
View File
@@ -172,6 +172,7 @@ class jobModel extends model
*/
public function initJob($id, $job, $repoType)
{
if(empty($id)) return false;
if($job->triggerType == 'schedule' and strpos($job->atDay, date('w')) !== false)
{
$compiles = $this->dao->select('*')->from(TABLE_COMPILE)->where('job')->eq($id)->andWhere('LEFT(createdDate, 10)')->eq(date('Y-m-d'))->fetchAll();
module/my/model.php
+1 -1
View File
@@ -32,7 +32,7 @@ class myModel extends model
{
unset($this->lang->my->menuOrder[15]);
$this->lang->my->menuOrder[32] = 'task';
$this->lang->my->dividerMenu = str_replace(',task,', ',' , $this->lang->my->menuOrder[20] . ',', $this->lang->my->dividerMenu);
$this->lang->my->dividerMenu = str_replace(',task,', ',' . $this->lang->my->menuOrder[20] . ',', $this->lang->my->dividerMenu);
}
elseif($role == 'po')
{
module/task/control.php
+1 -1
View File
@@ -330,7 +330,7 @@ class task extends control
$task = $this->task->getById($taskID);
if($this->post->comment != '' or !empty($changes) or !empty($files))
{
$action = !empty($changes) ? 'Edited' : 'Commented';
$action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented';
$fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : '';
$actionID = $this->action->create('task', $taskID, $action, $fileAction . $this->post->comment);
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
module/testcase/control.php
+1 -1
View File
@@ -590,7 +590,7 @@ class testcase extends control
if($this->post->comment != '' or !empty($changes) or !empty($files))
{
$this->loadModel('action');
$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('case', $caseID, $action, $fileAction . $this->post->comment);