From 02bd73a67be46ff980a20d3c86ad856b78ea0f4f Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 22 May 2017 09:53:16 +0800 Subject: [PATCH] * change for upgrade. --- VERSION | 2 +- config/config.php | 2 +- doc/CHANGELOG | 7 +++++++ module/common/lang/zh-tw.php | 3 +-- module/upgrade/lang/en.php | 1 + module/upgrade/lang/zh-cn.php | 1 + module/upgrade/lang/zh-tw.php | 1 + module/upgrade/model.php | 2 ++ 8 files changed, 15 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 6aeae34915..45acc9e667 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.2.stable +9.2.1 diff --git a/config/config.php b/config/config.php index 57d16d1b47..df2e4fbdcc 100644 --- a/config/config.php +++ b/config/config.php @@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}} /* Basic settings. */ $config = new config(); -$config->version = '9.2'; // The version of zentaopms. Don't change it. +$config->version = '9.2.1'; // 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 diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 56682f957d..71228410e9 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,10 @@ +2017-05-22 9.2.1 +修复的Bug +无法添加待办。 +批量添加待办时，待办名称添加必填项标识。 +新增产品/项目时，产品/项目--动态下，不显示操作动态。 +添加项目时，所属产品项缺失。 + 2017-05-16 9.2.stable 完成的需求 1883 windows一键安装包提示安装vC环境改为可选 diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 532a3faea2..20c8c793a1 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -725,7 +725,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->testtask->menu->blocked = '被阻塞版本|testtask|browse|productID=%s&branch=%s&type=%s,blocked'; $lang->testtask->menu->done = '已測版本|testtask|browse|productID=%s&branch=%s&type=%s,done'; $lang->testtask->menu->totalStatus = '全部|testtask|browse|productID=%s&branch=%s&type=%s,totalStatus'; - $lang->testtask->menu->report = array('link' => '報告|testreport|browse'); + $lang->testtask->menu->report = array('link' => '報告|testreport|browse', 'alias' => 'view,create,edit'); $lang->testtask->menu->create = array('link' => " 提交測試|testtask|create|productID=%s", 'float' => 'right'); $lang->testtask->menuOrder[5] = 'product'; @@ -738,7 +738,6 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->testtask->menuOrder[40] = 'report'; $lang->testtask->menuOrder[45] = 'create'; - /* Adjust sub menu of report module. */ $lang->testreport->menu = $lang->testtask->menu; $lang->testreport->menuOrder = $lang->testtask->menuOrder; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 1e4eb8eaad..f6d9999faf 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -120,3 +120,4 @@ $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'; $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; +$lang->upgrade->fromVersions['9_2'] = '9.2'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index f7671d64ca..b6dfbc3403 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -120,3 +120,4 @@ $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'; $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; +$lang->upgrade->fromVersions['9_2'] = '9.2'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 00d97e9c4c..8ca8f14647 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -120,3 +120,4 @@ $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'; $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; +$lang->upgrade->fromVersions['9_2'] = '9.2'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 8788bdc2e8..851c689718 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -178,6 +178,7 @@ class upgradeModel extends model $this->execSQL($this->getUpgradeFile('9.1.2')); $this->processCustomMenus(); $this->adjustPriv9_2(); + case '9_2': } $this->deletePatch(); @@ -270,6 +271,7 @@ class upgradeModel extends model case '9_1': $confirmContent .= file_get_contents($this->getUpgradeFile('9.1')); case '9_1_1': $confirmContent .= file_get_contents($this->getUpgradeFile('9.1.1')); case '9_1_2': $confirmContent .= file_get_contents($this->getUpgradeFile('9.1.2')); + case '9_2': } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }