* change for upgrade.

VERSION

@@ -1 +1 @@
-8.2.1
+8.2.2

config/config.php

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

db/zentao.sql

@@ -483,6 +483,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` (
   `module` mediumint(8) unsigned NOT NULL default '0',
   `plan` text NOT NULL default '',
   `source` varchar(20) NOT NULL,
+  `sourceNote` varchar(255) NOT NULL,
   `fromBug` mediumint(8) unsigned NOT NULL default '0',
   `title` varchar(255) NOT NULL,
   `keywords` varchar(255) NOT NULL,

module/story/lang/zh-tw.php

@@ -41,6 +41,7 @@ $lang->story->product        = "所屬{$lang->productCommon}";
 $lang->story->module         = '所屬模組';
 $lang->story->moduleAB       = '模組';
 $lang->story->source         = '需求來源';
+$lang->story->sourceNote     = '來源備註';
 $lang->story->fromBug        = '來源Bug';
 $lang->story->title          = '需求名稱';
 $lang->story->spec           = '需求描述';
@@ -127,6 +128,8 @@ $lang->story->sourceList['user']       = '用戶';
 $lang->story->sourceList['po']         = $lang->productCommon . '經理';
 $lang->story->sourceList['market']     = '市場';
 $lang->story->sourceList['service']    = '客服';
+$lang->story->sourceList['operation']  = '運營';
+$lang->story->sourceList['support']    = '技術支持';
 $lang->story->sourceList['competitor'] = '競爭對手';
 $lang->story->sourceList['partner']    = '合作夥伴';
 $lang->story->sourceList['dev']        = '開發人員';

module/upgrade/lang/en.php

@@ -102,3 +102,4 @@ $lang->upgrade->fromVersions['8_1']       = '8.1';
 $lang->upgrade->fromVersions['8_1_3']     = '8.1.3';
 $lang->upgrade->fromVersions['8_2_beta']  = '8.2.beta';
 $lang->upgrade->fromVersions['8_2']       = '8.2';
+$lang->upgrade->fromVersions['8_2_1']     = '8.2.1';

module/upgrade/lang/zh-cn.php

@@ -102,3 +102,4 @@ $lang->upgrade->fromVersions['8_1']       = '8.1';
 $lang->upgrade->fromVersions['8_1_3']     = '8.1.3';
 $lang->upgrade->fromVersions['8_2_beta']  = '8.2.beta';
 $lang->upgrade->fromVersions['8_2']       = '8.2';
+$lang->upgrade->fromVersions['8_2_1']     = '8.2.1';

module/upgrade/lang/zh-tw.php

@@ -102,3 +102,4 @@ $lang->upgrade->fromVersions['8_1']       = '8.1';
 $lang->upgrade->fromVersions['8_1_3']     = '8.1.3';
 $lang->upgrade->fromVersions['8_2_beta']  = '8.2.beta';
 $lang->upgrade->fromVersions['8_2']       = '8.2';
+$lang->upgrade->fromVersions['8_2_1']     = '8.2.1';

module/upgrade/model.php

@@ -142,6 +142,8 @@ class upgradeModel extends model
                 $this->adjustConfigSectionAndKey();
             case '8_2_beta':
             case '8_2':
+            case '8_2_1':
+                $this->execSQL($this->getUpgradeFile('8.2.1'));
 
             default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
         }
@@ -220,6 +222,7 @@ class upgradeModel extends model
         case '8_1_3':     $confirmContent .= file_get_contents($this->getUpgradeFile('8.1.3'));
         case '8_2_beta': 
         case '8_2':
+        case '8_2_1':     $confirmContent .= file_get_contents($this->getUpgradeFile('8.2.1'));
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }