From fe3aa18ff3f94c3f5d6f82c0e91181fa090decd1 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Sun, 2 May 2010 16:31:01 +0000
Subject: [PATCH 1/5]  * fix the error.

---
 module/upgrade/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 62e0faa975..179450c0b7 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -169,9 +169,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.0stable');
     }
 
     /* 更新每个表的company字段。*/

From f9a0e16b7f1a793b4d230cf576b30aff65052a04 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Mon, 3 May 2010 07:07:24 +0000
Subject: [PATCH 2/5]  * change the version to 1.0.

---
 config/config.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/config.php b/config/config.php
index 7fa1384841..47b84d3189 100644
--- a/config/config.php
+++ b/config/config.php
@@ -22,11 +22,11 @@
  * @link        http://www.zentaoms.com
  */
 /* ���������趨��*/
-$config->version     = '1.0.stable';                    // �汾�ţ������޸ġ�
-$config->encoding    = 'UTF-8';                         // ��վ�ı��롣
-$config->cookiePath  = '/';                             // cookie����׷����
-$config->cookieLife  = time() + 2592000;                // cookie���������ڡ�
-$config->timezone    = 'Asia/Shanghai';                 //ʱ�����ã���ϸ���б�������� http://www.php.net/manual/en/timezones.php
+$config->version     = '1.0';             // �汾�ţ������޸ġ�
+$config->encoding    = 'UTF-8';           // ��վ�ı��롣
+$config->cookiePath  = '/';               // cookie����׷����
+$config->cookieLife  = time() + 2592000;  // cookie���������ڡ�
+$config->timezone    = 'Asia/Shanghai';   //ʱ�����ã���ϸ���б�������� http://www.php.net/manual/en/timezones.php
 
 /* ����ʽ���á�*/
 $config->requestType = 'PATH_INFO';       // ��λ�ȡ��ǰ�������Ϣ����ѡֵ��PATH_INFO|GET

From 5c80d496786800ed814963c3c2a41642240d94a2 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Mon, 3 May 2010 07:12:25 +0000
Subject: [PATCH 3/5]  * adjust the upgrade.

---
 module/upgrade/model.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 179450c0b7..b20fb9642e 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -75,6 +75,10 @@ class upgradeModel extends model
             $this->upgradeFrom1_0rc1To1_0rc2();
             $this->upgradeFrom1_0rc2To1_0stable();
         }
+        elseif($fromVersion == '1_0rc2')
+        {
+            $this->upgradeFrom1_0rc2To1_0stable();
+        }
     }
 
     /* 确认。*/
@@ -171,7 +175,7 @@ class upgradeModel extends model
     /* 从1.0rc2版本升级到1.0stable版本。*/
     private function upgradeFrom1_0rc2To1_0stable()
     {
-        $this->updateVersion('1.0stable');
+        $this->updateVersion('1.0');
     }
 
     /* 更新每个表的company字段。*/

From 48d751f76f1eea722f310e8a5b8bf6f69de8cb25 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Mon, 3 May 2010 07:16:39 +0000
Subject: [PATCH 4/5]  + add 10rc2.

---
 module/upgrade/lang/zh-cn.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index e56c0189a3..09e08a6c24 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -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';

From 4098545eaf73c11cd3a97e820fb49d53b88a9cbe Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Mon, 3 May 2010 07:42:28 +0000
Subject: [PATCH 5/5]  * fix the notice error.

---
 module/testcase/view/view.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index d11d6c3672..0c3f28470f 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -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');