diff --git a/db/update16.3.sql b/db/update16.3.sql index 932852b033..ce016e787b 100644 --- a/db/update16.3.sql +++ b/db/update16.3.sql @@ -12,3 +12,4 @@ ALTER TABLE `zt_action` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `r ALTER TABLE `zt_searchindex` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `title`; ALTER TABLE `zt_config` ADD `vision` varchar(10) NOT NULL DEFAULT '' AFTER `id`; ALTER TABLE `zt_config` DROP INDEX `unique`, ADD UNIQUE `unique` (`vision`,`owner`,`module`,`section`,`key`); +ALTER TABLE `zt_todo` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `deleted`; diff --git a/db/zentao.sql b/db/zentao.sql index c2ee46e3b8..4cc16566e5 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1555,6 +1555,7 @@ CREATE TABLE IF NOT EXISTS `zt_todo` ( `closedBy` varchar(30) NOT NULL DEFAULT '', `closedDate` datetime NOT NULL, `deleted` enum('0','1') NOT NULL default '0', + `vision` varchar(10) NOT NULL DEFAULT 'rnd', PRIMARY KEY (`id`), KEY `account` (`account`), KEY `assignedTo` (`assignedTo`), diff --git a/extension/lite/block/ext/view/main.lite.html.hook.php b/extension/lite/block/ext/view/main.lite.html.hook.php index 2224028d6d..e6cea48798 100644 --- a/extension/lite/block/ext/view/main.lite.html.hook.php +++ b/extension/lite/block/ext/view/main.lite.html.hook.php @@ -3,3 +3,8 @@ $('.block-project table > thead > tr > th:last-child').remove(); $('.block-project table > tbody > tr > td:last-child').remove(); $('.block-scrumtest').remove(); + + + diff --git a/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php b/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php new file mode 100644 index 0000000000..93373fe779 --- /dev/null +++ b/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php @@ -0,0 +1,6 @@ + diff --git a/extension/lite/todo/ext/view/create.lite.html.hook.php b/extension/lite/todo/ext/view/create.lite.html.hook.php new file mode 100644 index 0000000000..b589a10995 --- /dev/null +++ b/extension/lite/todo/ext/view/create.lite.html.hook.php @@ -0,0 +1,6 @@ + diff --git a/module/todo/model.php b/module/todo/model.php index 5473018c90..b4154105f5 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -175,6 +175,7 @@ class todoModel extends model $todo->assignedTo = $this->app->user->account; $todo->assignedBy = $this->app->user->account; $todo->assignedDate = $now; + $todo->vision = $todos->vision[$i]; if(in_array($todo->type, $this->config->todo->moduleList)) $todo->idvalue = isset($todos->{$this->config->todo->objectList[$todo->type]}[$i + 1]) ? $todos->{$this->config->todo->objectList[$todo->type]}[$i + 1] : 0;