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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
王怡栋
2022-03-08 13:03:51 +08:00
parent 72d89e3c9f e823f2223c
commit 34e744bb23
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
-3
View File
@@ -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
module/upgrade/lang/version.php
+2
View File
@@ -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';
module/upgrade/model.php
+1 -1
View File
@@ -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. */