diff --git a/VERSION b/VERSION index 0359f24328..592f36ef3a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.4 +9.5 diff --git a/config/config.php b/config/config.php index 997c8eb030..53475a302a 100644 --- a/config/config.php +++ b/config/config.php @@ -16,20 +16,20 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '9.4'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. -$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. -$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. +$config->version = '9.5'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. +$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. $config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php. $config->webRoot = ''; // URL根目录。 The root path of the url. /* 框架路由相关设置。Routing settings. */ $config->requestType = 'PATH_INFO'; // 请求类型：PATH_INFO|PATHINFO2|GET。 The request type: PATH_INFO|PATH_INFO2|GET. -$config->requestFix = '-'; // PATH_INFO和PATH_INFO2模式的分隔符。 The divider in the url when PATH_INFO|PATH_INFO2. -$config->moduleVar = 'm'; // 请求类型为GET：模块变量名。 requestType=GET: the module var name. -$config->methodVar = 'f'; // 请求类型为GET：模块变量名。 requestType=GET: the method var name. -$config->viewVar = 't'; // 请求类型为GET：视图变量名。 requestType=GET: the view var name. -$config->sessionVar = 'zentaosid'; // 请求类型为GET：session变量名。 requestType=GET: the session var name. -$config->views = ',html,json,mhtml,'; // 支持的视图类型。 Supported view formats. +$config->requestFix = '-'; // PATH_INFO和PATH_INFO2模式的分隔符。 The divider in the url when PATH_INFO|PATH_INFO2. +$config->moduleVar = 'm'; // 请求类型为GET：模块变量名。 requestType=GET: the module var name. +$config->methodVar = 'f'; // 请求类型为GET：模块变量名。 requestType=GET: the method var name. +$config->viewVar = 't'; // 请求类型为GET：视图变量名。 requestType=GET: the view var name. +$config->sessionVar = 'zentaosid'; // 请求类型为GET：session变量名。 requestType=GET: the session var name. +$config->views = ',html,json,mhtml,'; // 支持的视图类型。 Supported view formats. /* 支持的主题和语言。Supported thems and languages. */ $config->themes['default'] = 'default'; diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 0de231abec..673c18a3f9 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,17 +1,29 @@ +2017-08-25 9.5 +3124 取消工时记录的255字数限制 +3123 导出增加对个数字段的支持 +3122 文档附件库默认按照时间从新到旧的顺序显示 +3121 测试bug增加批量激活功能 已完成 +3120 测试报告导出功能增加相应的权限 +3119 每日提醒异步邮件列表中的发送人改成后台发信配置中的发信人 +3118 测试-用例 从用例库导入用例的时候增加搜索功能 +3117 已删除用户默认不再列出 +3116 文档库的附件库增加列表展示方式 +以及修改了大量的已知BUG。 + 2017-07-24 9.4 -3078 将跳回然之框架的功能默认设置为关闭 -3077 bug导出增加对 截止日期 字段的支持 -3076 把禅道数据库中所有的mailto字段都修改成 text 类型 -3075 增加bug提交和编辑表单编辑器的高度 -3074 数据库受损修复增加超级管理员验证 -3073 计划列表默认显示全部。 -3071 集成到然之之后右上角个人中心的菜单向左展开 -3070 批量操作的滚动条将选择和编辑按钮的边框去掉 -3069 测试-版本关联用例的时候过滤掉未评审的用例 -3068 发布关联需求的时候给默认的推荐列表 -3067 调整产品发布关联需求页面的排版 -3066 创建计划时提示之前的计划名称 -3065 附件库继承产品或者项目的访问权限 +3078 将跳回然之框架的功能默认设置为关闭 +3077 bug导出增加对 截止日期 字段的支持 +3076 把禅道数据库中所有的mailto字段都修改成 text 类型 +3075 增加bug提交和编辑表单编辑器的高度 +3074 数据库受损修复增加超级管理员验证 +3073 计划列表默认显示全部。 +3071 集成到然之之后右上角个人中心的菜单向左展开 +3070 批量操作的滚动条将选择和编辑按钮的边框去掉 +3069 测试-版本关联用例的时候过滤掉未评审的用例 +3068 发布关联需求的时候给默认的推荐列表 +3067 调整产品发布关联需求页面的排版 +3066 创建计划时提示之前的计划名称 +3065 附件库继承产品或者项目的访问权限 2017-06-21 9.3.beta 3038 修改loadModel改为单例模式,提升性能 diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 5ead4966e6..8052d9b7bf 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -13,7 +13,7 @@ class upgrade extends control { /** * The index page. - * + * * @access public * @return void */ @@ -29,18 +29,18 @@ class upgrade extends control /** * Check agree license. - * + * * @access public * @return void */ public function license() - { + { if($this->get->agree == true) $this->locate(inlink('backup')); $this->view->title = $this->lang->upgrade->common; $this->view->license = file_get_contents($this->app->getBasePath() . 'doc/LICENSE'); $this->display(); - } + } /** * Backup. diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 4668c3ec59..c106dd5a0d 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -123,3 +123,4 @@ $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; $lang->upgrade->fromVersions['9_2'] = '9.2'; $lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; $lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; +$lang->upgrade->fromVersions['9_4'] = '9.4'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 97aef5f586..f434f6813a 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -123,3 +123,4 @@ $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; $lang->upgrade->fromVersions['9_2'] = '9.2'; $lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; $lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; +$lang->upgrade->fromVersions['9_4'] = '9.4'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index dc42dd61f0..a2a367e3a5 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -123,3 +123,4 @@ $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; $lang->upgrade->fromVersions['9_2'] = '9.2'; $lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; $lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; +$lang->upgrade->fromVersions['9_4'] = '9.4'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index a1639dbaf4..93922771d2 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -23,8 +23,8 @@ class upgradeModel extends model /** * The execute method. According to the $fromVersion call related methods. - * - * @param string $fromVersion + * + * @param string $fromVersion * @access public * @return void */ @@ -182,6 +182,9 @@ class upgradeModel extends model case '9_2_1': case '9_3_beta': $this->execSQL($this->getUpgradeFile('9.3.beta')); + case '9_4': + $this->execSQL($this->getUpgradeFile('9.4')); + $this->adjustPriv9_4(); } $this->deletePatch(); @@ -277,6 +280,7 @@ class upgradeModel extends model case '9_2': case '9_2_1': case '9_3_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('9.3.beta')); + case '9_4': $confirmContent .= file_get_contents($this->getUpgradeFile('9.4')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); } @@ -322,7 +326,7 @@ class upgradeModel extends model $bugs = $this->dao->select('id, steps')->from(TABLE_BUG)->fetchAll(); $userTemplates = $this->dao->select('id, content')->from($this->config->db->prefix . 'userTPL')->fetchAll(); - + foreach($bugs as $id => $bug) { $bug->steps = ubb::parseUBB($bug->steps); @@ -337,7 +341,7 @@ class upgradeModel extends model /** * Update nl to br from 1.2 version. - * + * * @access public * @return void */ @@ -996,7 +1000,7 @@ class upgradeModel extends model foreach($tables2Rename as $oldTable => $newTable) { if(!isset($tablesExists[$oldTable])) continue; - + $upgradebak = $newTable . '_othertablebak'; if(isset($tablesExists[$upgradebak])) $this->dbh->query("DROP TABLE `$upgradebak`"); if(isset($tablesExists[$newTable])) $this->dbh->query("RENAME TABLE `$newTable` TO `$upgradebak`"); @@ -1656,7 +1660,7 @@ class upgradeModel extends model /** * Adjust priv for 9.2. - * + * * @access public * @return void */ @@ -1698,9 +1702,27 @@ class upgradeModel extends model return true; } + /** + * Adjust priv for 9.4. + * + * @access public + * @return void + */ + public function adjustPriv9_4() + { + $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('bug')->andWhere('method')->eq('activate')->fetchPairs('group', 'group'); + foreach($groups as $groupID) + { + $data = new stdclass(); + $data->group = $groupID; + $data->module = 'bug'; + $data->method = 'batchActivate'; + } + } + /** * Judge any error occers. - * + * * @access public * @return bool */