From 31d42cf359ee61cd611b2a067091bb50485f4e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E5=8B=87?= Date: Wed, 19 Apr 2023 03:24:41 +0000 Subject: [PATCH 1/3] * Fix db for dm. --- db/update18.3.sql | 2 ++ db/zentao.sql | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/db/update18.3.sql b/db/update18.3.sql index 7cb7c600d2..faf56de13b 100644 --- a/db/update18.3.sql +++ b/db/update18.3.sql @@ -1045,6 +1045,8 @@ CHANGE `editedBy` `editedBy` char(30) NOT NULL DEFAULT '', CHANGE `editedDate` `editedDate` datetime NULL; ALTER TABLE `zt_workflowfield` +CHANGE `default` `default` varchar(100) NOT NULL DEFAULT '', +CHANGE `rules` `rules` varchar(255) NOT NULL DEFAULT '', CHANGE `expression` `expression` text NULL, CHANGE `placeholder` `placeholder` varchar(100) NOT NULL DEFAULT '', CHANGE `desc` `desc` text NULL, diff --git a/db/zentao.sql b/db/zentao.sql index 9aea282979..ec07598543 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -12257,8 +12257,8 @@ CREATE TABLE IF NOT EXISTS `zt_workflowfield` ( `control` varchar(20) NOT NULL, `expression` text NULL, `options` text NOT NULL, - `default` varchar(100) NOT NULL, - `rules` varchar(255) NOT NULL, + `default` varchar(100) NOT NULL DEFAULT '', + `rules` varchar(255) NOT NULL DEFAULT '', `placeholder` varchar(100) NOT NULL DEFAULT '', `order` smallint(5) unsigned NOT NULL, `searchOrder` smallint(5) unsigned NOT NULL DEFAULT '0', From 2fcff8c54a9d8cbc91f3d4759b9222b21bd74b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E5=8B=87?= Date: Wed, 19 Apr 2023 03:43:01 +0000 Subject: [PATCH 2/3] * Fix bug#34335. --- db/update18.3.sql | 5 +++++ db/zentao.sql | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/db/update18.3.sql b/db/update18.3.sql index faf56de13b..ccc30b3ea5 100644 --- a/db/update18.3.sql +++ b/db/update18.3.sql @@ -485,6 +485,11 @@ CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '', CHANGE `editedDate` `editedDate` datetime NULL; ALTER TABLE `zt_effort` +CHANGE `left` `left` float NOT NULL DEFAULT '0', +CHANGE `consumed` `consumed` float NOT NULL DEFAULT '0', +CHANGE `product` `product` text NULL, +CHANGE `project` `project` mediumint unsigned NOT NULL DEFAULT '0', +CHANGE `execution` `execution` mediumint unsigned NOT NULL DEFAULT '0', CHANGE `begin` `begin` smallint(4) unsigned zerofill NOT NULL DEFAULT '0', CHANGE `end` `end` smallint(4) unsigned zerofill NOT NULL DEFAULT '0'; diff --git a/db/zentao.sql b/db/zentao.sql index ec07598543..f24015f74a 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -742,15 +742,15 @@ CREATE TABLE IF NOT EXISTS `zt_effort` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, `objectType` varchar(30) NOT NULL, `objectID` mediumint(8) unsigned NOT NULL, - `product` text NOT NULL, - `project` mediumint(8) unsigned NOT NULL, - `execution` mediumint(8) unsigned NOT NULL, + `product` text NULL, + `project` mediumint(8) unsigned NOT NULL DEFAULT '0', + `execution` mediumint(8) unsigned NOT NULL DEFAULT '0', `account` varchar(30) NOT NULL, `work` text, `vision` varchar(10) NOT NULL DEFAULT 'rnd', `date` date NOT NULL, - `left` float NOT NULL, - `consumed` float NOT NULL, + `left` float NOT NULL DEFAULT '0', + `consumed` float NOT NULL DEFAULT '0', `begin` smallint(4) unsigned zerofill NOT NULL DEFAULT '0', `end` smallint(4) unsigned zerofill NOT NULL DEFAULT '0', `extra` text, From 51a43d37d65c28574c281ea34ee2dea3909baea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E5=8B=87?= Date: Wed, 19 Apr 2023 04:34:10 +0000 Subject: [PATCH 3/3] * Fix date display in task module. --- module/task/model.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index 8f952f5d6f..a562812693 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -128,6 +128,8 @@ class taskModel extends model ->stripTags($this->config->task->editor->create['id'], $this->config->allowedTags) ->join('mailto', ',') ->remove('after,files,labels,assignedTo,uid,storyEstimate,storyDesc,storyPri,team,teamSource,teamEstimate,teamConsumed,teamLeft,teamMember,multiple,teams,contactListMenu,selectTestStory,testStory,testPri,testEstStarted,testDeadline,testAssignedTo,testEstimate,sync,otherLane,region,lane,estStartedDitto,deadlineDitto') + ->removeIF(empty($this->post->estStarted), 'estStarted') + ->removeIF(empty($this->post->deadline), 'deadline') ->add('version', 1) ->get(); @@ -2318,7 +2320,7 @@ class taskModel extends model ->setDefault('assignedTo', '') ->setDefault('status', 'doing') ->setDefault('finishedBy, canceledBy, closedBy, closedReason', '') - ->setDefault('finishedDate, canceledDate, closedDate', '0000-00-00 00:00:00') + ->setDefault('finishedDate, canceledDate, closedDate', null) ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', helper::now()) ->setDefault('assignedDate', helper::now()) @@ -2403,6 +2405,12 @@ class taskModel extends model ->andWhere('t1.vision')->eq($this->config->vision) ->fetch(); if(!$task) return false; + $task->openedDate = substr($task->openedDate, 0, 19); + $task->finishedDate = substr($task->finishedDate, 0, 19); + $task->canceledDate = substr($task->canceledDate, 0, 19); + $task->closedDate = substr($task->closedDate, 0, 19); + $task->lastEditedDate = substr($task->lastEditedDate, 0, 19); + $task->realStarted = substr($task->realStarted, 0, 19); $children = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->eq($taskID)->andWhere('deleted')->eq(0)->fetchAll('id'); $task->children = $children;