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

+ tag of 1.0 stable.

Browse Source
This commit is contained in:
wangchunsheng
2010-05-03 07:44:55 +00:00
parent 5ebd7bd064 4098545eaf
commit eaecd62fee
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/config.php
View File

@@ -22,11 +22,11 @@
* @link http://www.zentaoms.com
*/
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>趨<EFBFBD><E8B6A8>*/
$config->version = '1.0.stable'; // <20>汾<EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸ġ<DEB8>
$config->encoding = 'UTF-8'; // <20><>վ<EFBFBD>ı<EFBFBD><C4B1>롣
$config->cookiePath = '/'; // cookie<69><65><EFBFBD><EFBFBD>Ч·<D0A7><C2B7><EFBFBD><EFBFBD>
$config->cookieLife = time() + 2592000; // cookie<69><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD>
$config->timezone = 'Asia/Shanghai'; //ʱ<><CAB1><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><C3A3><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD>б<EFBFBD><D0B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> http://www.php.net/manual/en/timezones.php
$config->version = '1.0'; // <20>汾<EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸ġ<DEB8>
$config->encoding = 'UTF-8'; // <20><>վ<EFBFBD>ı<EFBFBD><C4B1>롣
$config->cookiePath = '/'; // cookie<69><65><EFBFBD><EFBFBD>Ч·<D0A7><C2B7><EFBFBD><EFBFBD>
$config->cookieLife = time() + 2592000; // cookie<69><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD>
$config->timezone = 'Asia/Shanghai'; //ʱ<><CAB1><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><C3A3><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD>б<EFBFBD><D0B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> http://www.php.net/manual/en/timezones.php
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD>á<EFBFBD>*/
$config->requestType = 'PATH_INFO'; // <20><><EFBFBD>λ<EFBFBD>ȡ<EFBFBD><C8A1>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2><EFBFBD><EFBFBD>ѡֵ<D1A1><D6B5>PATH_INFO|GET

2
module/testcase/view/view.html.php
View File

@@ -109,7 +109,7 @@
<td class='nobr'>
<?php
if(isset($case->storyTitle)) echo html::a($this->createLink('story', 'view', "storyID=$case->story"), "#$case->story:$case->storyTitle");
if($case->storyStatus == 'active' and $case->latestStoryVersion > $case->storyVersion)
if($case->story and $case->storyStatus == 'active' and $case->latestStoryVersion > $case->storyVersion)
{
echo "(<span class='warning'>{$lang->story->changed}</span> ";
echo html::a($this->createLink('testcase', 'confirmStoryChange', "caseID=$case->id"), $lang->confirm, 'hiddenwin');

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

@@ -49,3 +49,4 @@ $lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA';
$lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA';
$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA';
$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1';
$lang->upgrade->fromVersions['1_0rc2'] = '1.0 RC2';

8
module/upgrade/model.php
View File

@@ -75,6 +75,10 @@ class upgradeModel extends model
$this->upgradeFrom1_0rc1To1_0rc2();
$this->upgradeFrom1_0rc2To1_0stable();
}
elseif($fromVersion == '1_0rc2')
{
$this->upgradeFrom1_0rc2To1_0stable();
}
}
/* 确认。*/
@@ -169,9 +173,9 @@ class upgradeModel extends model
}
/* 从1.0rc2版本升级到1.0stable版本。*/
private function upgradeFrom1_0rc1To1_0rc2()
private function upgradeFrom1_0rc2To1_0stable()
{
$this->updateVersion('1.0rc2');
$this->updateVersion('1.0');
}
/* 更新每个表的company字段。*/