From ce20e88eb8f226687c4c0766ed29a7a4f25b4822 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 23 Jun 2014 06:01:40 +0000 Subject: [PATCH 1/3] * fix a bug. --- module/task/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index 4c8655a5be..83394b2b2a 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -200,7 +200,7 @@ class taskModel extends model $this->dao->update(TABLE_TASK)->data($task) ->autoCheck() ->batchCheckIF($task->status != 'cancel', $this->config->task->edit->requiredFields, 'notempty') - ->checkIF($task->deadline != '', 'deadline', 'ge', $task->estStarted) + ->checkIF($task->deadline != '0000-00-00', 'deadline', 'ge', $task->estStarted) ->checkIF($task->estimate != false, 'estimate', 'float') ->checkIF($task->left != false, 'left', 'float') From 506eafdc13438b17e80da430b34f70b20dcd512b Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 24 Jun 2014 09:12:59 +0000 Subject: [PATCH 2/3] * change to strtolower. --- config/config.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/config/config.php b/config/config.php index e466e0da05..16f01ab129 100644 --- a/config/config.php +++ b/config/config.php @@ -96,36 +96,36 @@ define('TABLE_CONFIG', '`' . $config->db->prefix . 'config`'); define('TABLE_USER', '`' . $config->db->prefix . 'user`'); define('TABLE_TODO', '`' . $config->db->prefix . 'todo`'); define('TABLE_GROUP', '`' . $config->db->prefix . 'group`'); -define('TABLE_GROUPPRIV', '`' . $config->db->prefix . 'groupPriv`'); -define('TABLE_USERGROUP', '`' . $config->db->prefix . 'userGroup`'); -define('TABLE_USERQUERY', '`' . $config->db->prefix . 'userQuery`'); -define('TABLE_USERCONTACT', '`' . $config->db->prefix . 'userContact`'); +define('TABLE_GROUPPRIV', '`' . $config->db->prefix . 'grouppriv`'); +define('TABLE_USERGROUP', '`' . $config->db->prefix . 'usergroup`'); +define('TABLE_USERQUERY', '`' . $config->db->prefix . 'userquery`'); +define('TABLE_USERCONTACT', '`' . $config->db->prefix . 'usercontact`'); define('TABLE_BUG', '`' . $config->db->prefix . 'bug`'); define('TABLE_CASE', '`' . $config->db->prefix . 'case`'); -define('TABLE_CASESTEP', '`' . $config->db->prefix . 'caseStep`'); -define('TABLE_TESTTASK', '`' . $config->db->prefix . 'testTask`'); -define('TABLE_TESTRUN', '`' . $config->db->prefix . 'testRun`'); -define('TABLE_TESTRESULT', '`' . $config->db->prefix . 'testResult`'); -define('TABLE_USERTPL', '`' . $config->db->prefix . 'userTPL`'); +define('TABLE_CASESTEP', '`' . $config->db->prefix . 'casestep`'); +define('TABLE_TESTTASK', '`' . $config->db->prefix . 'testtask`'); +define('TABLE_TESTRUN', '`' . $config->db->prefix . 'testrun`'); +define('TABLE_TESTRESULT', '`' . $config->db->prefix . 'testresult`'); +define('TABLE_USERTPL', '`' . $config->db->prefix . 'usertpl`'); define('TABLE_PRODUCT', '`' . $config->db->prefix . 'product`'); define('TABLE_STORY', '`' . $config->db->prefix . 'story`'); -define('TABLE_STORYSPEC', '`' . $config->db->prefix . 'storySpec`'); -define('TABLE_PRODUCTPLAN', '`' . $config->db->prefix . 'productPlan`'); +define('TABLE_STORYSPEC', '`' . $config->db->prefix . 'storyspec`'); +define('TABLE_PRODUCTPLAN', '`' . $config->db->prefix . 'productplan`'); define('TABLE_RELEASE', '`' . $config->db->prefix . 'release`'); define('TABLE_PROJECT', '`' . $config->db->prefix . 'project`'); define('TABLE_TASK', '`' . $config->db->prefix . 'task`'); define('TABLE_TEAM', '`' . $config->db->prefix . 'team`'); -define('TABLE_PROJECTPRODUCT','`' . $config->db->prefix . 'projectProduct`'); -define('TABLE_PROJECTSTORY', '`' . $config->db->prefix . 'projectStory`'); -define('TABLE_TASKESTIMATE', '`' . $config->db->prefix . 'taskEstimate`'); +define('TABLE_PROJECTPRODUCT','`' . $config->db->prefix . 'projectproduct`'); +define('TABLE_PROJECTSTORY', '`' . $config->db->prefix . 'projectstory`'); +define('TABLE_TASKESTIMATE', '`' . $config->db->prefix . 'taskestimate`'); define('TABLE_EFFORT', '`' . $config->db->prefix . 'effort`'); define('TABLE_BURN', '`' . $config->db->prefix . 'burn`'); define('TABLE_BUILD', '`' . $config->db->prefix . 'build`'); -define('TABLE_DOCLIB', '`' . $config->db->prefix . 'docLib`'); +define('TABLE_DOCLIB', '`' . $config->db->prefix . 'doclib`'); define('TABLE_DOC', '`' . $config->db->prefix . 'doc`'); define('TABLE_MODULE', '`' . $config->db->prefix . 'module`'); From 428c4be874922497042ac4aa92e934efbaf40f12 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 24 Jun 2014 09:24:41 +0000 Subject: [PATCH 3/3] * adjust sql. --- db/update6.0.beta1.sql | 6 +++--- module/upgrade/model.php | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/db/update6.0.beta1.sql b/db/update6.0.beta1.sql index a858a88fd0..849839acf9 100644 --- a/db/update6.0.beta1.sql +++ b/db/update6.0.beta1.sql @@ -1,6 +1,6 @@ ALTER TABLE `zt_task` DROP `statusCustom`; -ALTER TABLE `zt_story` CHANGE `status` `status` enum('','draft','active','closed','changed') COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `estimate`; +ALTER TABLE `zt_story` CHANGE `status` `status` enum('','changed','active','draft','closed') COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `estimate`; ALTER TABLE `zt_story` CHANGE `stage` `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released') COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'wait' AFTER `status`; -ALTER TABLE `zt_testTask` CHANGE `status` `status` enum('wait','doing','done','blocked') COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'wait' AFTER `report`; +ALTER TABLE `zt_testTask` CHANGE `status` `status` enum('blocked','doing','wait','done') COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'wait' AFTER `report`; ALTER TABLE `zt_todo` CHANGE `status` `status` enum('wait','doing','done') COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'wait' AFTER `desc`; -ALTER TABLE `zt_team` CHANGE `hours` `hours` float unsigned NOT NULL DEFAULT '0' AFTER `days`; +ALTER TABLE `zt_team` CHANGE `hours` `hours` float(2,1) unsigned NOT NULL DEFAULT '0' AFTER `days`; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 5aef4a168a..5d26b975b3 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -103,6 +103,8 @@ class upgradeModel extends model $this->execSQL($this->getUpgradeFile('5.2.1')); case '5_3': case '6_0_beta1': + $this->execSQL($this->getUpgradeFile('6.0.beta1')); + $this->toLowerTable(); $this->fixBugOSInfo(); $this->fixTaskFinishedBy(); @@ -164,6 +166,7 @@ class upgradeModel extends model case '5_2': case '5_2_1': $confirmContent .= file_get_contents($this->getUpgradeFile('5.2.1')); case '5_3': + case '6_0_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('6.0.beta1')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }