diff --git a/db/update20.1.1.sql b/db/update20.1.1.sql index 45f0e03ce9..5ee9c78b33 100644 --- a/db/update20.1.1.sql +++ b/db/update20.1.1.sql @@ -39,7 +39,7 @@ ALTER TABLE `zt_story` ADD `root` mediumint NOT NULL DEFAULT '0' AFTER `isParent ALTER TABLE `zt_story` ADD `path` text NULL AFTER `root`; ALTER TABLE `zt_story` ADD `grade` smallint(6) NOT NULL DEFAULT '0' AFTER `path`; ALTER TABLE `zt_story` ADD `parentVersion` smallint NOT NULL DEFAULT '0' AFTER `version`; -ALTER TABLE `zt_story` CHANGE `stage` `stage` enum('','wait','defining','planning','planned','projected','designing','designed','developing','developed','testing','tested','verified','rejected','delivering','released','closed') NOT NULL DEFAULT 'wait'; +ALTER TABLE `zt_story` CHANGE `stage` `stage` enum('','wait','defining','inroadmap','incharter','planning','planned','projected','designing','designed','developing','developed','testing','tested','verified','rejected','delivering','released','closed') NOT NULL DEFAULT 'wait'; ALTER TABLE `zt_story` DROP `childStories`; CREATE INDEX `root` ON `zt_story` (`root`); UPDATE `zt_story` SET stage = 'defining' WHERE stage = 'wait' AND (parent = -1 OR type != 'story'); diff --git a/db/zentao.sql b/db/zentao.sql index c5a48aa1a2..2fb72dead9 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1803,7 +1803,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` ( `status` enum('','changing','active','draft','closed','reviewing','launched','developing') NOT NULL DEFAULT '', `subStatus` varchar(30) NOT NULL DEFAULT '', `color` char(7) NOT NULL DEFAULT '', - `stage` enum('','wait','defining','planning','planned','projected','designing','designed','developing','developed','testing','tested','verified','rejected','delivering','pending','released','closed') NOT NULL DEFAULT 'wait', + `stage` enum('','wait','defining','inroadmap','incharter','planning','planned','projected','designing','designed','developing','developed','testing','tested','verified','rejected','delivering','pending','released','closed') NOT NULL DEFAULT 'wait', `stagedBy` char(30) NOT NULL DEFAULT '', `mailto` text NULL, `lib` mediumint(8) unsigned NOT NULL DEFAULT '0', diff --git a/module/story/lang/de.php b/module/story/lang/de.php index 23ff8c1c44..a1e44939d4 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -252,6 +252,8 @@ if($config->systemMode == 'PLM') $lang->story->stageList[''] = ''; $lang->story->stageList['defining'] = 'Defining'; $lang->story->stageList['wait'] = 'Wartend'; +$lang->story->stageList['inroadmap'] = 'In Roadmap'; +$lang->story->stageList['incharter'] = 'In Charter'; $lang->story->stageList['planning'] = 'Planning'; $lang->story->stageList['planned'] = 'Geplant'; $lang->story->stageList['projected'] = 'Projektiert'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index fa2057556c..7587b97829 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -252,6 +252,8 @@ if($config->systemMode == 'PLM') $lang->story->stageList[''] = ''; $lang->story->stageList['defining'] = 'Defining'; $lang->story->stageList['wait'] = 'Waiting'; +$lang->story->stageList['inroadmap'] = 'In Roadmap'; +$lang->story->stageList['incharter'] = 'In Charter'; $lang->story->stageList['planning'] = 'Planning'; $lang->story->stageList['planned'] = 'Planned'; $lang->story->stageList['projected'] = 'Projected'; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index dcb5b7d59a..9979d705c6 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -252,6 +252,8 @@ if($config->systemMode == 'PLM') $lang->story->stageList[''] = ''; $lang->story->stageList['defining'] = 'Defining'; $lang->story->stageList['wait'] = 'En Attente'; +$lang->story->stageList['inroadmap'] = 'In Roadmap'; +$lang->story->stageList['incharter'] = 'In Charter'; $lang->story->stageList['planning'] = 'Planning'; $lang->story->stageList['planned'] = 'Plannifée'; $lang->story->stageList['projected'] = 'Projetée'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 365da7ca0e..81bb89617b 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -252,6 +252,8 @@ if($config->systemMode == 'PLM') $lang->story->stageList[''] = ''; $lang->story->stageList['defining'] = '定义中'; $lang->story->stageList['wait'] = '未开始'; +$lang->story->stageList['inroadmap'] = '已设路标'; +$lang->story->stageList['incharter'] = 'Charter立项'; $lang->story->stageList['planning'] = '规划中'; $lang->story->stageList['planned'] = "已计划"; $lang->story->stageList['projected'] = '已立项'; diff --git a/module/story/zen.php b/module/story/zen.php index 8782ab7c9b..92d6543587 100644 --- a/module/story/zen.php +++ b/module/story/zen.php @@ -628,6 +628,8 @@ class storyZen extends story /* 设置默认值。 */ if(empty($fields['reviewer']['default'])) $fields['reviewer']['default'] = implode(',', array_keys($reviewerList)); + if($story->type == 'story') unset($fields['stage']['options']['inroadmap'], $fields['stage']['options']['incharter']); + $this->view->users = $users; $this->view->storyReviewers = array_keys($reviewerList); $this->view->gradeRule = $this->config->{$story->type}->gradeRule;