From 352fcc29b9864e1e1e676ea2d703a41ea9a4afc7 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 14 Apr 2021 10:01:20 +0800 Subject: [PATCH] * Add upgrade logic. --- VERSION | 2 +- config/config.php | 2 +- module/misc/lang/de.php | 2 ++ module/misc/lang/en.php | 2 ++ module/misc/lang/fr.php | 2 ++ module/misc/lang/vi.php | 2 ++ module/misc/lang/zh-cn.php | 2 ++ module/upgrade/lang/version.php | 1 + module/upgrade/model.php | 3 +++ 9 files changed, 16 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 893d61407f..a0bf4fe0a2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.0.rc2 +15.0.rc3 diff --git a/config/config.php b/config/config.php index 149c92900b..a59d0e88eb 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '15.0.rc2'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '15.0.rc3'; // 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. diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php index 0127d934ac..470d71b388 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -84,6 +84,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Letzte Version'; $lang->misc->feature->detailed = 'Details'; +$lang->misc->releaseDate['15.0.rc3'] = '2021-04-16'; $lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; $lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; @@ -140,6 +141,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; +$lang->misc->feature->all['15.0.rc3'][] = array('title' => 'Adjust details，Fix bug', 'desc' => ''); $lang->misc->feature->all['15.0.rc2'][] = array('title' => 'Fix Bug.', 'desc' => ''); $lang->misc->feature->all['15.0.rc1'][] = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => 'Adjust annual data.', 'desc' => ''); diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index bb1e093367..bbb343a7b9 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -84,6 +84,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->detailed = 'Detail'; +$lang->misc->releaseDate['15.0.rc3'] = '2021-04-16'; $lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; $lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; @@ -140,6 +141,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; +$lang->misc->feature->all['15.0.rc3'][] = array('title' => 'Adjust details，Fix bug', 'desc' => ''); $lang->misc->feature->all['15.0.rc2'][] = array('title' => 'Fix Bug.', 'desc' => ''); $lang->misc->feature->all['15.0.rc1'][] = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => 'Adjust annual data.', 'desc' => ''); diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 2d0458f56a..98688ab3d7 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -84,6 +84,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Dernière Version'; $lang->misc->feature->detailed = 'Détail'; +$lang->misc->releaseDate['15.0.rc3'] = '2021-04-16'; $lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; $lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; @@ -140,6 +141,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; +$lang->misc->feature->all['15.0.rc3'][] = array('title' => 'Adjust details, fix bug.', 'desc' => ''); $lang->misc->feature->all['15.0.rc2'][] = array('title' => 'Fix Bug.', 'desc' => ''); $lang->misc->feature->all['15.0.rc1'][] = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => 'Adjust annual data.', 'desc' => ''); diff --git a/module/misc/lang/vi.php b/module/misc/lang/vi.php index 557f27373b..6dc8ed4018 100644 --- a/module/misc/lang/vi.php +++ b/module/misc/lang/vi.php @@ -84,6 +84,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->detailed = 'Chi tiết'; +$lang->misc->releaseDate['15.0.rc3'] = '2021-04-16'; $lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; $lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; @@ -140,6 +141,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; +$lang->misc->feature->all['15.0.rc3'][] = array('title' => 'Adjust detail, fix bug.', 'desc' => ''); $lang->misc->feature->all['15.0.rc2'][] = array('title' => 'Fix Bug.', 'desc' => ''); $lang->misc->feature->all['15.0.rc1'][] = array('title' => 'Upgrade to 15,reframe menu, add program.', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => 'Adjust annual data.', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index eeace1960c..ebad9c5999 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -84,6 +84,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '详情'; +$lang->misc->releaseDate['15.0.rc3'] = '2021-04-16'; $lang->misc->releaseDate['15.0.rc2'] = '2021-04-09'; $lang->misc->releaseDate['15.0.rc1'] = '2021-04-05'; $lang->misc->releaseDate['12.5.3'] = '2021-01-06'; @@ -140,6 +141,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; +$lang->misc->feature->all['15.0.rc3'][] = array('title' => '完善细节，修复Bug', 'desc' => ''); $lang->misc->feature->all['15.0.rc2'][] = array('title' => '修复Bug，优化界面交互', 'desc' => ''); $lang->misc->feature->all['15.0.rc1'][] = array('title' => '升级到15版本，重构导航、文档库，增加项目集管理', 'desc' => ''); $lang->misc->feature->all['12.5.3'][] = array('title' => '优化年度总结', 'desc' => ''); diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 2eede042cb..671e85e43d 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -134,3 +134,4 @@ $lang->upgrade->fromVersions['12_5_1'] = '12.5.1'; $lang->upgrade->fromVersions['12_5_2'] = '12.5.2'; $lang->upgrade->fromVersions['12_5_3'] = '12.5.3'; $lang->upgrade->fromVersions['15_0_rc1'] = '15.0.rc1'; +$lang->upgrade->fromVersions['15_0_rc2'] = '15.0.rc2'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 94a6ba4d9c..4ee03e2537 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -643,6 +643,9 @@ class upgradeModel extends model $this->saveLogs('Execute 15_0_rc1'); $this->adjustUserView(); $this->appendExec('15_0_rc1'); + case '15_0_rc2': + $this->saveLogs('Execute 15_0_rc2'); + $this->appendExec('15_0_rc2'); } $this->deletePatch();