From 7c33a75b31a65c06d39ae63c13e7ef473bd4bc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Tue, 8 Mar 2022 11:10:17 +0800 Subject: [PATCH 1/3] * Add from version. --- module/upgrade/lang/version.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 011b32e5cb..b5eac52a6e 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -154,6 +154,7 @@ $lang->upgrade->fromVersions['16_1'] = '16.1'; $lang->upgrade->fromVersions['16_2'] = '16.2'; $lang->upgrade->fromVersions['16_3'] = '16.3'; $lang->upgrade->fromVersions['16_4'] = '16.4'; +$lang->upgrade->fromVersions['16_5'] = '16.5'; /* Pro. */ $lang->upgrade->fromVersions['pro1_0'] = 'Pro1.0'; @@ -306,6 +307,7 @@ $lang->upgrade->fromVersions['biz6_1'] = 'Biz6.1'; $lang->upgrade->fromVersions['biz6_2'] = 'Biz6.2'; $lang->upgrade->fromVersions['biz6_3'] = 'Biz6.3'; $lang->upgrade->fromVersions['biz6_4'] = 'Biz6.4'; +$lang->upgrade->fromVersions['biz6_5'] = 'Biz6.5'; /* Max. */ $lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4'; From 01d35645e6494209a2284df706822ca69d2ecb70 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 8 Mar 2022 11:17:10 +0800 Subject: [PATCH 2/3] * Modify the upgrade error report. --- module/upgrade/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 3789bcc6c6..4c2887a6ca 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -39,7 +39,7 @@ class upgradeModel extends model set_time_limit(0); $editions = array('p' => 'proVersion', 'b' => 'bizVersion', 'm' => 'maxVersion'); - $fromEdition = is_numeric($fromVersion[0]) ? 'open' : $editons[$fromVersion[0]]; + $fromEdition = is_numeric($fromVersion[0]) ? 'open' : $editions[$fromVersion[0]]; $openVersion = is_numeric($fromVersion[0]) ? $fromVersion : $this->config->upgrade->{$fromEdition}[$fromVersion]; /* Get versions to be updated. */ From ee52c0370e925ebfd900bb49a82d3c152484540a Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 8 Mar 2022 11:28:16 +0800 Subject: [PATCH 3/3] * Need not to merge xuanxuan sql. --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 1070028424..0a0bb955f5 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,6 @@ pms: make zentaoxx unzip zentaoxx.*.zip cp zentaoxx/* zentaopms/ -r - cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql make package zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms rm -fr zentaopms zentaoxx zentaoxx.*.zip @@ -195,7 +194,6 @@ en: make zentaoxx unzip zentaoxx.*.zip cp zentaoxx/* zentaopms/ -r - cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql make package mv zentaopms zentaoalm zip -r -9 ZenTaoALM.$(VERSION).int.zip zentaoalm @@ -240,7 +238,6 @@ ci: make zentaoxx unzip zentaoxx.*.zip cp zentaoxx/* zentaopms/ -r - cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql endif make package