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

* change for upgrade to 4.0.beta2.

Browse Source
This commit is contained in:
wangyidong
2012-12-18 03:05:26 +00:00
parent 0dbce5cb8f
commit 83c6c5dfd2
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -61,6 +61,8 @@ tgz:
mv zentaotest.zip zentaopms/tmp/extension
mv zentaostory.zip zentaopms/tmp/extension
mv zentaotask.zip zentaopms/tmp/extension
cd ~/zentao/notify && git pull && git archive --format=zip -9 --prefix=notify/ HEAD > ./notify.zip
mv ~/zentao/notify/notify.zip zentaopms/tmp/extension
# zip it.
zip -r -9 ZenTaoPMS.$(VERSION).zip zentaopms
rm -fr zentaopms

2
VERSION
View File

@@ -1 +1 @@
4.0.beta1
4.0.beta2

2
config/config.php
View File

@@ -12,7 +12,7 @@
* @link http://www.zentao.net
*/
/* Basic settings. */
$config->version = '4.0.beta1'; // The version of zentaopms. Don't change it.
$config->version = '4.0.beta2'; // The version of zentaopms. Don't change it.
$config->encoding = 'UTF-8'; // The encoding 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

1
module/upgrade/lang/en.php
View File

@@ -65,3 +65,4 @@ $lang->upgrade->fromVersions['3_1'] = '3.1';
$lang->upgrade->fromVersions['3_2'] = '3.2';
$lang->upgrade->fromVersions['3_2_1'] = '3.2.1';
$lang->upgrade->fromVersions['3_3'] = '3.3';
$lang->upgrade->fromVersions['4_0_beta1'] = '4.0 BETA1';

1
module/upgrade/lang/zh-cn.php
View File

@@ -65,3 +65,4 @@ $lang->upgrade->fromVersions['3_1'] = '3.1';
$lang->upgrade->fromVersions['3_2'] = '3.2';
$lang->upgrade->fromVersions['3_2_1'] = '3.2.1';
$lang->upgrade->fromVersions['3_3'] = '3.3';
$lang->upgrade->fromVersions['4_0_beta1'] = '4.0 BETA1';

10
module/upgrade/model.php
View File

@@ -75,6 +75,7 @@ class upgradeModel extends model
$this->execSQL($this->getUpgradeFile('3.3'));
$this->updateTaskAssignedTo();
$this->loadModel('setting')->setItem('system', 'common', '', 'flow', 'full');
case '4_0_beta1': $this->execSQL($this->getUpgradeFile('4.0.beta1'));
default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
}
@@ -116,10 +117,11 @@ class upgradeModel extends model
case '3_0_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
case '3_0_beta2':
case '3_0':
case '3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
case '3_2': $confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
case '3_2_1': $confirmContent .= file_get_contents($this->getUpgradeFile('3.2.1'));
case '3_3': $confirmContent .= file_get_contents($this->getUpgradeFile('3.3'));
case '3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
case '3_2': $confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
case '3_2_1': $confirmContent .= file_get_contents($this->getUpgradeFile('3.2.1'));
case '3_3': $confirmContent .= file_get_contents($this->getUpgradeFile('3.3'));
case '4.0.beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('4.0.beta1'));
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}