diff --git a/db/update18.3.sql b/db/update18.3.sql index c51ca3a762..69418260c0 100644 --- a/db/update18.3.sql +++ b/db/update18.3.sql @@ -819,7 +819,10 @@ CHANGE `duplicateStory` `duplicateStory` mediumint unsigned NOT NULL DEFAULT '0' CHANGE `notifyEmail` `notifyEmail` varchar(100) NOT NULL DEFAULT ''; ALTER TABLE `zt_storyreview` +CHANGE `result` `result` varchar(30) NOT NULL DEFAULT '', CHANGE `reviewDate` `reviewDate` datetime NULL; +ALTER TABLE `zt_storyspec` +CHANGE `files` `files` text NULL; ALTER TABLE `zt_task` CHANGE `designVersion` `designVersion` smallint unsigned NOT NULL DEFAULT '1', diff --git a/db/zentao.sql b/db/zentao.sql index ab4e967fa5..58044708eb 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1620,7 +1620,7 @@ CREATE TABLE IF NOT EXISTS `zt_storyreview` ( `story` mediumint(9) NOT NULL, `version` smallint(6) NOT NULL, `reviewer` varchar(30) NOT NULL, - `result` varchar(30) NOT NULL, + `result` varchar(30) NOT NULL DEFAULT '', `reviewDate` datetime NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE UNIQUE INDEX `story` ON `zt_storyreview`(`story`,`version`,`reviewer`); @@ -1641,7 +1641,7 @@ CREATE TABLE IF NOT EXISTS `zt_storyspec` ( `title` varchar(255) NOT NULL, `spec` mediumtext NOT NULL, `verify` mediumtext NOT NULL, - `files` text NOT NULL + `files` text NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE UNIQUE INDEX `story` ON `zt_storyspec`(`story`,`version`); -- DROP TABLE IF EXISTS `zt_storystage`; diff --git a/module/story/model.php b/module/story/model.php index 414d0a087d..c2648ea8fa 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -582,7 +582,7 @@ class storyModel extends model $story->source = $stories->source[$i]; $story->category = $stories->category[$i]; $story->pri = $stories->pri[$i]; - $story->estimate = $stories->estimate[$i]; + $story->estimate = $stories->estimate[$i] ? $stories->estimate[$i] : 0; $story->spec = $stories->spec[$i]; $story->verify = $stories->verify[$i]; $story->status = $saveDraft ? 'draft' : ((empty($stories->reviewer[$i]) and !$forceReview) ? 'active' : 'reviewing');