* change for 4.0.1 version upgrade.

This commit is contained in:
wangyidong
2013-03-18 01:29:18 +00:00
parent 66e6803478
commit cba1a14452
6 changed files with 8 additions and 3 deletions

View File

@@ -1 +1 @@
4.0.stable
4.0.1.stable

View File

@@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* Basic settings. */
$config = new config();
$config->version = '4.0'; // The version of zentaopms. Don't change it.
$config->version = '4.0.1'; // 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

View File

@@ -313,7 +313,7 @@ CREATE TABLE IF NOT EXISTS `zt_module` (
`parent` mediumint(8) unsigned NOT NULL default '0',
`path` char(255) NOT NULL default '',
`grade` tinyint(3) unsigned NOT NULL default '0',
`order` tinyint(3) unsigned NOT NULL default '0',
`order` smallint(5) unsigned NOT NULL default '0',
`type` char(30) NOT NULL,
`owner` varchar(30) NOT NULL,
PRIMARY KEY (`id`),

View File

@@ -67,3 +67,4 @@ $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';
$lang->upgrade->fromVersions['4_0_beta2'] = '4.0 BETA2';
$lang->upgrade->fromVersions['4_0'] = '4.0';

View File

@@ -67,3 +67,4 @@ $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';
$lang->upgrade->fromVersions['4_0_beta2'] = '4.0 BETA2';
$lang->upgrade->fromVersions['4_0'] = '4.0';

View File

@@ -80,6 +80,8 @@ class upgradeModel extends model
$this->execSQL($this->getUpgradeFile('4.0.beta2'));
$this->updateProjectType();
$this->updateEstimatePriv();
case '4_0':
$this->execSQL($this->getUpgradeFile('4.0'));
default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
}
@@ -127,6 +129,7 @@ class upgradeModel extends model
case '3_3': $confirmContent .= file_get_contents($this->getUpgradeFile('3.3'));
case '4_0_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('4.0.beta1'));
case '4_0_beta2': $confirmContent .= file_get_contents($this->getUpgradeFile('4.0.beta2'));
case '4_0': $confirmContent .= file_get_contents($this->getUpgradeFile('4.0'));
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}