Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
xia0ta0
2014-06-25 09:01:23 +08:00
parent 6572e1c2d3 428c4be874
commit 2917c23ffc
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.php
+15 -15
View File
@@ -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`');
db/update6.0.beta1.sql
+3 -3
View File
@@ -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`;
module/task/model.php
+1 -1
View File
@@ -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')
module/upgrade/model.php
+3
View File
@@ -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);
}