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

* change for upgrade.

Browse Source
This commit is contained in:
wangyidong
2017-04-19 11:23:00 +08:00
parent 7a788b150e
commit 4c12bcb111
11 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
9.1.1
9.1.2
config/config.php
+1 -1
View File
@@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* Basic settings. */
$config = new config();
$config->version = '9.1.1'; // The version of zentaopms. Don't change it.
$config->version = '9.1.2'; // The version of zentaopms. Don't change it.
$config->charset = 'UTF-8'; // The charset of zentaopms.
$config->cookieLife = time() + 2592000; // The cookie life time.
$config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php
db/zentao.sql
+1
View File
@@ -25,6 +25,7 @@ CREATE TABLE IF NOT EXISTS `zt_block` (
`params` text NOT NULL,
`order` tinyint(3) unsigned NOT NULL DEFAULT '0',
`grid` tinyint(3) unsigned NOT NULL DEFAULT '0',
`height` smallint(5) unsigned NOT NULL DEFAULT '0',
`hidden` tinyint(1) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `accountModuleOrder` (`account`,`module`,`order`),
module/bug/lang/zh-tw.php
+1
View File
@@ -134,6 +134,7 @@ $lang->bug->legendSteps = '重現步驟';
$lang->bug->legendComment = '備註';
$lang->bug->legendLife = 'BUG的一生';
$lang->bug->legendMisc = '其他相關';
$lang->bug->legendRelated = '其他信息';
/* 功能按鈕。*/
$lang->bug->buttonConfirm = '確認';
module/dev/lang/zh-tw.php
+3 -1
View File
@@ -52,7 +52,7 @@ $lang->dev->tableList['taskestimate'] = '任務預計';
$lang->dev->tableList['team'] = '團隊';
$lang->dev->tableList['testresult'] = '測試結果';
$lang->dev->tableList['testrun'] = '測試執行';
$lang->dev->tableList['testtask'] = '測試任務';
$lang->dev->tableList['testtask'] = '測試版本';
$lang->dev->tableList['todo'] = '待辦';
$lang->dev->tableList['user'] = '用戶';
$lang->dev->tableList['usercontact'] = '用戶聯繫人';
@@ -77,6 +77,8 @@ $lang->dev->tableList['search'] = '搜索';
$lang->dev->tableList['sso'] = '單點登錄';
$lang->dev->tableList['svn'] = 'SVN';
$lang->dev->tableList['testcase'] = '測試用例';
$lang->dev->tableList['testreport'] = '測試報告';
$lang->dev->tableList['testsuite'] = '測試套件';
$lang->dev->tableList['tree'] = '模組關係';
$lang->dev->tableList['upgrade'] = '更新';
$lang->dev->tableList['cron'] = '定時任務';
module/testtask/lang/zh-tw.php
+1 -1
View File
@@ -42,7 +42,7 @@ $lang->testtask->totalStatus = "全部";
$lang->testtask->all = "全部產品";
$lang->testtask->id = '編號';
$lang->testtask->common = '測試視圖版本';
$lang->testtask->common = '測試版本';
$lang->testtask->product = '所屬' . $lang->productCommon;
$lang->testtask->project = '所屬' . $lang->projectCommon;
$lang->testtask->build = '版本';
module/upgrade/lang/en.php
+1
View File
@@ -118,3 +118,4 @@ $lang->upgrade->fromVersions['9_0_beta'] = '9.0.beta';
$lang->upgrade->fromVersions['9_0'] = '9.0';
$lang->upgrade->fromVersions['9_0_1'] = '9.0.1';
$lang->upgrade->fromVersions['9_1'] = '9.1';
$lang->upgrade->fromVersions['9_1_1'] = '9.1.1';
module/upgrade/lang/zh-cn.php
+1
View File
@@ -118,3 +118,4 @@ $lang->upgrade->fromVersions['9_0_beta'] = '9.0.beta';
$lang->upgrade->fromVersions['9_0'] = '9.0';
$lang->upgrade->fromVersions['9_0_1'] = '9.0.1';
$lang->upgrade->fromVersions['9_1'] = '9.1';
$lang->upgrade->fromVersions['9_1_1'] = '9.1.1';
module/upgrade/lang/zh-tw.php
+1
View File
@@ -118,3 +118,4 @@ $lang->upgrade->fromVersions['9_0_beta'] = '9.0.beta';
$lang->upgrade->fromVersions['9_0'] = '9.0';
$lang->upgrade->fromVersions['9_0_1'] = '9.0.1';
$lang->upgrade->fromVersions['9_1'] = '9.1';
$lang->upgrade->fromVersions['9_1_1'] = '9.1.1';
module/upgrade/model.php
+3
View File
@@ -172,6 +172,8 @@ class upgradeModel extends model
$this->adjustPriv9_0_1();
case '9_1':
$this->execSQL($this->getUpgradeFile('9.1'));
case '9_1_1':
$this->execSQL($this->getUpgradeFile('9.1.1'));
}
$this->deletePatch();
@@ -262,6 +264,7 @@ class upgradeModel extends model
case '9_0':
case '9_0_1': $confirmContent .= file_get_contents($this->getUpgradeFile('9.0.1'));
case '9_1': $confirmContent .= file_get_contents($this->getUpgradeFile('9.1'));
case '9_1_1': $confirmContent .= file_get_contents($this->getUpgradeFile('9.1.1'));
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
www/checktable.php
+9 -2
View File
@@ -1,5 +1,5 @@
<?php
error_reporting(E_ALL);
error_reporting(0);
include '../framework/helper.class.php';
include '../config/config.php';
@@ -69,7 +69,14 @@ else
<div class='container mw-700px'>
<?php if($status == 'createFile'):?>
<div class='panel-body'>
<?php printf($lang->user->noticeResetFile, $_SESSION['checkFileName']);?>
<?php
$checkFileName = $_SESSION['checkFileName'];
if(!($_SERVER['SERVER_ADDR'] == '127.0.0.1' or filter_var($_SERVER['SERVER_ADDR'], FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE) === false))
{
$checkFileName = str_replace(dirname(dirname(__FILE__)) . DS, '', $checkFileName);
}
printf($lang->user->noticeResetFile, $checkFileName);
?>
</div>
<p><a href='<?php echo $config->webRoot . 'checktable.php';?>' class='btn'><i class='icon-refresh'></i></a></p>
<?php elseif($status == 'check'):?>