From d0cb047b5809e6222b2ff0dd975b96e464d52a08 Mon Sep 17 00:00:00 2001 From: liugang Date: Thu, 5 Jul 2018 09:20:34 +0800 Subject: [PATCH 01/18] * Finish task #4617 --- module/doc/lang/zh-tw.php | 1 + module/task/lang/en.php | 2 +- module/task/lang/zh-cn.php | 2 +- module/task/lang/zh-tw.php | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index 9e322fa9f1..8035bd9bad 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -44,6 +44,7 @@ $lang->doc->acl = '權限'; $lang->doc->groups = '分組'; $lang->doc->users = '用戶'; $lang->doc->item = '項'; +$lang->doc->num = '文檔數量'; $lang->doc->searchResult = '搜索結果'; $lang->doc->moduleDoc = '按模組瀏覽'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 7d2971beeb..829c88b28b 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -83,7 +83,7 @@ $lang->task->openedDateAB = 'Add'; $lang->task->finishedBy = 'Finished'; $lang->task->finishedByAB = 'Finished'; $lang->task->finishedDate = 'Finished on'; -$lang->task->finishedDateAB = 'Date'; +$lang->task->finishedDateAB = 'Finished on'; $lang->task->canceledBy = 'Cancelled by'; $lang->task->canceledDate = 'Cancelled on'; $lang->task->closedBy = 'Closed by'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index aca623c10f..c77d1c29f3 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -83,7 +83,7 @@ $lang->task->openedDateAB = '创建'; $lang->task->finishedBy = '由谁完成'; $lang->task->finishedByAB = '完成者'; $lang->task->finishedDate = '完成时间'; -$lang->task->finishedDateAB = '完成'; +$lang->task->finishedDateAB = '完成时间'; $lang->task->canceledBy = '由谁取消'; $lang->task->canceledDate = '取消时间'; $lang->task->closedBy = '由谁关闭'; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index c4440ed4d9..30aecf7827 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -83,7 +83,7 @@ $lang->task->openedDateAB = '創建'; $lang->task->finishedBy = '由誰完成'; $lang->task->finishedByAB = '完成者'; $lang->task->finishedDate = '完成時間'; -$lang->task->finishedDateAB = '完成'; +$lang->task->finishedDateAB = '完成時間'; $lang->task->canceledBy = '由誰取消'; $lang->task->canceledDate = '取消時間'; $lang->task->closedBy = '由誰關閉'; From 646d9d60ecbc8bb23a3aa61bd688589b7b1eed09 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 5 Jul 2018 10:02:47 +0800 Subject: [PATCH 02/18] * finish task #4636. --- db/update10.0.sql | 103 +++++++++++++++++++++++++++++ db/zentao.sql | 84 +++++++++++++++++------ module/common/view/footer.html.php | 2 +- 3 files changed, 167 insertions(+), 22 deletions(-) diff --git a/db/update10.0.sql b/db/update10.0.sql index b5b242c41c..8aae707f83 100644 --- a/db/update10.0.sql +++ b/db/update10.0.sql @@ -1,2 +1,105 @@ ALTER TABLE `zt_storyspec` CHANGE `title` `title` varchar(255) NOT NULL; update `zt_todo` set assignedTo = 'closed', assignedDate = closedDate where status = 'closed'; + +ALTER TABLE `zt_action` DROP INDEX `action`; +ALTER TABLE `zt_action` ADD INDEX `date` (`date`); +ALTER TABLE `zt_action` ADD INDEX `actor` (`actor`); +ALTER TABLE `zt_action` ADD INDEX `project` (`project`); +ALTER TABLE `zt_action` ADD INDEX `objectID` (`objectID`); + +ALTER TABLE `zt_block` DROP INDEX `block`; +ALTER TABLE `zt_block` ADD INDEX `account` (`account`); + +ALTER TABLE `zt_bug` DROP INDEX `bug`; +ALTER TABLE `zt_bug` ADD INDEX `product` (`product`); +ALTER TABLE `zt_bug` ADD INDEX `project` (`project`); +ALTER TABLE `zt_bug` ADD INDEX `status` (`status`); +ALTER TABLE `zt_bug` ADD INDEX `plan` (`plan`); +ALTER TABLE `zt_bug` ADD INDEX `story` (`story`); +ALTER TABLE `zt_bug` ADD INDEX `case` (`case`); +ALTER TABLE `zt_bug` ADD INDEX `assignedTo` (`assignedTo`); + +ALTER TABLE `zt_build` DROP INDEX `build`; +ALTER TABLE `zt_build` ADD INDEX `product` (`product`); +ALTER TABLE `zt_build` ADD INDEX `project` (`project`); + +ALTER TABLE `zt_case` DROP INDEX `case`; +ALTER TABLE `zt_case` ADD INDEX `product` (`product`); +ALTER TABLE `zt_case` ADD INDEX `story` (`story`); +ALTER TABLE `zt_case` ADD INDEX `plan` (`plan`); + +ALTER TABLE `zt_casestep` DROP INDEX `case`; +ALTER TABLE `zt_casestep` ADD INDEX `case` (`case`); +ALTER TABLE `zt_casestep` ADD INDEX `version` (`version`); + +ALTER TABLE `zt_dept` DROP INDEX `dept`; +ALTER TABLE `zt_dept` ADD INDEX `parent` (`parent`); +ALTER TABLE `zt_dept` ADD INDEX `path` (`path`); + +ALTER TABLE `zt_doc` DROP INDEX `doc`; +ALTER TABLE `zt_doc` ADD INDEX `product` (`product`); +ALTER TABLE `zt_doc` ADD INDEX `project` (`project`); +ALTER TABLE `zt_doc` ADD INDEX `lib` (`lib`); + +ALTER TABLE `zt_doclib` ADD INDEX `product` (`product`); +ALTER TABLE `zt_doclib` ADD INDEX `project` (`project`); + +ALTER TABLE `zt_extension` DROP INDEX `extension`; +ALTER TABLE `zt_extension` ADD INDEX `name` (`name`); +ALTER TABLE `zt_extension` ADD INDEX `installedTime` (`installedTime`); + +ALTER TABLE `zt_file` DROP INDEX `file`; +ALTER TABLE `zt_file` ADD INDEX `objectType` (`objectType`); +ALTER TABLE `zt_file` ADD INDEX `objectID` (`objectID`); + +ALTER TABLE `zt_module` DROP INDEX `module`; +ALTER TABLE `zt_module` ADD INDEX `root` (`root`); +ALTER TABLE `zt_module` ADD INDEX `type` (`type`); +ALTER TABLE `zt_module` ADD INDEX `path` (`path`); + +ALTER TABLE `zt_productplan` DROP INDEX `plan`; +ALTER TABLE `zt_productplan` ADD INDEX `product` (`product`); +ALTER TABLE `zt_productplan` ADD INDEX `end` (`end`); + +ALTER TABLE `zt_project` DROP INDEX `project`; +ALTER TABLE `zt_project` ADD INDEX `parent` (`parent`); +ALTER TABLE `zt_project` ADD INDEX `begin` (`begin`); +ALTER TABLE `zt_project` ADD INDEX `end` (`end`); +ALTER TABLE `zt_project` ADD INDEX `status` (`status`); +ALTER TABLE `zt_project` ADD INDEX `order` (`order`); + +ALTER TABLE `zt_release` ADD INDEX `product` (`product`); + +ALTER TABLE `zt_story` DROP INDEX `story`; +ALTER TABLE `zt_story` ADD INDEX `product` (`product`); +ALTER TABLE `zt_story` ADD INDEX `status` (`status`); +ALTER TABLE `zt_story` ADD INDEX `assignedTo` (`assignedTo`); + +ALTER TABLE `zt_task` DROP INDEX `task`; +ALTER TABLE `zt_task` ADD INDEX `project` (`project`); +ALTER TABLE `zt_task` ADD INDEX `story` (`story`); +ALTER TABLE `zt_task` ADD INDEX `assignedTo` (`assignedTo`); + +ALTER TABLE `zt_testresult` DROP INDEX `testresult`; +ALTER TABLE `zt_testresult` ADD INDEX `case` (`case`); +ALTER TABLE `zt_testresult` ADD INDEX `version` (`version`); +ALTER TABLE `zt_testresult` ADD INDEX `run` (`run`); + +ALTER TABLE `zt_testsuite` ADD INDEX `product` (`product`); + +ALTER TABLE `zt_testtask` ADD INDEX `product` (`product`); + +ALTER TABLE `zt_todo` DROP INDEX `todo`; +ALTER TABLE `zt_todo` ADD INDEX `account` (`account`); +ALTER TABLE `zt_todo` ADD INDEX `assignedTo` (`assignedTo`); +ALTER TABLE `zt_todo` ADD INDEX `finishedBy` (`finishedBy`); +ALTER TABLE `zt_todo` ADD INDEX `date` (`date`); + +ALTER TABLE `zt_user` DROP INDEX `user`; +ALTER TABLE `zt_user` ADD INDEX `dept` (`dept`); +ALTER TABLE `zt_user` ADD INDEX `email` (`email`); +ALTER TABLE `zt_user` ADD INDEX `commiter` (`commiter`); + +ALTER TABLE `zt_userquery` DROP INDEX `query`; +ALTER TABLE `zt_userquery` ADD INDEX `account` (`account`); +ALTER TABLE `zt_userquery` ADD INDEX `module` (`module`); diff --git a/db/zentao.sql b/db/zentao.sql index b0abac0d50..93ef040c4e 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -12,7 +12,10 @@ CREATE TABLE IF NOT EXISTS `zt_action` ( `extra` text NOT NULL, `read` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), - KEY `action` (`objectID`,`product`,`project`,`action`,`date`) + KEY `date` (`date`), + KEY `actor` (`actor`), + KEY `project` (`project`), + KEY `objectID` (`objectID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_block`; CREATE TABLE IF NOT EXISTS `zt_block` ( @@ -29,7 +32,7 @@ CREATE TABLE IF NOT EXISTS `zt_block` ( `hidden` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id`), UNIQUE KEY `accountModuleOrder` (`account`,`module`,`order`), - KEY `block` (`account`,`module`) + KEY `account` (`account`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_branch`; CREATE TABLE IF NOT EXISTS `zt_branch` ( @@ -92,7 +95,13 @@ CREATE TABLE IF NOT EXISTS `zt_bug` ( `lastEditedDate` datetime NOT NULL, `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), - KEY `bug` (`product`,`module`,`project`,`assignedTo`) + KEY `product` (`product`), + KEY `project` (`project`), + KEY `status` (`status`), + KEY `plan` (`plan`), + KEY `story` (`story`), + KEY `case` (`case`), + KEY `assignedTo` (`assignedTo`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_build`; CREATE TABLE IF NOT EXISTS `zt_build` ( @@ -110,7 +119,8 @@ CREATE TABLE IF NOT EXISTS `zt_build` ( `desc` text NOT NULL, `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), - KEY `build` (`product`,`project`) + KEY `product` (`product`), + KEY `project` (`project`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_burn`; CREATE TABLE IF NOT EXISTS `zt_burn` ( @@ -161,7 +171,9 @@ CREATE TABLE IF NOT EXISTS `zt_case` ( `lastRunDate` datetime NOT NULL, `lastRunResult` char(30) NOT NULL, PRIMARY KEY (`id`), - KEY `case` (`product`,`module`,`story`) + KEY `product` (`product`), + KEY `story` (`story`), + KEY `plan` (`plan`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_casestep`; CREATE TABLE IF NOT EXISTS `zt_casestep` ( @@ -173,7 +185,8 @@ CREATE TABLE IF NOT EXISTS `zt_casestep` ( `desc` text NOT NULL, `expect` text NOT NULL, PRIMARY KEY (`id`), - KEY `case` (`case`,`version`) + KEY `case` (`case`), + KEY `version` (`version`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_company`; CREATE TABLE IF NOT EXISTS `zt_company` ( @@ -242,7 +255,8 @@ CREATE TABLE IF NOT EXISTS `zt_dept` ( `function` char(255) NOT NULL default '', `manager` char(30) NOT NULL default '', PRIMARY KEY (`id`), - KEY `dept` (`parent`,`path`) + KEY `parent` (`parent`), + KEY `path` (`path`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_doc`; CREATE TABLE IF NOT EXISTS `zt_doc` ( @@ -266,7 +280,9 @@ CREATE TABLE IF NOT EXISTS `zt_doc` ( `version` smallint(5) unsigned NOT NULL DEFAULT '1', `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), - KEY `doc` (`product`,`project`) + KEY `product` (`product`), + KEY `project` (`project`), + KEY `lib` (`lib`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_doccontent`; CREATE TABLE IF NOT EXISTS `zt_doccontent` ( @@ -294,7 +310,9 @@ CREATE TABLE IF NOT EXISTS `zt_doclib` ( `collector` text NOT NULL, `order` tinyint(5) unsigned NOT NULL, `deleted` enum('0','1') NOT NULL default '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `product` (`product`), + KEY `project` (`project`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_effort`; CREATE TABLE IF NOT EXISTS `zt_effort` ( @@ -331,7 +349,8 @@ CREATE TABLE IF NOT EXISTS `zt_extension` ( `status` varchar(20) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `code` (`code`), - KEY `extension` (`name`,`installedTime`) + KEY `name` (`name`), + KEY `installedTime` (`installedTime`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_file`; CREATE TABLE IF NOT EXISTS `zt_file` ( @@ -348,7 +367,8 @@ CREATE TABLE IF NOT EXISTS `zt_file` ( `extra` varchar(255) NOT NULL, `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), - KEY `file` (`objectType`,`objectID`) + KEY `objectType` (`objectType`), + KEY `objectID` (`objectID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_group`; CREATE TABLE IF NOT EXISTS `zt_group` ( @@ -408,7 +428,9 @@ CREATE TABLE IF NOT EXISTS `zt_module` ( `short` varchar(30) NOT NULL, `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), - KEY `module` (`root`,`type`,`path`) + KEY `root` (`root`), + KEY `type` (`type`), + KEY `path` (`path`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_notify`; CREATE TABLE IF NOT EXISTS `zt_notify` ( @@ -460,7 +482,8 @@ CREATE TABLE IF NOT EXISTS `zt_productplan` ( `order` text NOT NULL, `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), - KEY `plan` (`product`,`end`) + KEY `product` (`product`), + KEY `end` (`end`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_project`; CREATE TABLE IF NOT EXISTS `zt_project` ( @@ -495,7 +518,11 @@ CREATE TABLE IF NOT EXISTS `zt_project` ( `order` mediumint(8) unsigned NOT NULL, `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), - KEY `project` (`parent`,`begin`,`end`,`status`,`order`) + KEY `parent` (`parent`), + KEY `begin` (`begin`), + KEY `end` (`end`), + KEY `status` (`status`), + KEY `order` (`order`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_projectproduct`; CREATE TABLE IF NOT EXISTS `zt_projectproduct` ( @@ -530,6 +557,7 @@ CREATE TABLE IF NOT EXISTS `zt_release` ( `status` varchar(20) NOT NULL default 'normal', `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), + KEY `product` (`product`), KEY `build` (`build`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_story`; @@ -569,7 +597,9 @@ CREATE TABLE IF NOT EXISTS `zt_story` ( `version` smallint(6) NOT NULL default '1', `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), - KEY `story` (`product`,`module`,`status`,`assignedTo`) + KEY `product` (`product`), + KEY `status` (`status`), + KEY `assignedTo` (`assignedTo`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_storyspec`; CREATE TABLE IF NOT EXISTS `zt_storyspec` ( @@ -632,7 +662,9 @@ CREATE TABLE IF NOT EXISTS `zt_task` ( `lastEditedDate` datetime NOT NULL, `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), - KEY `task` (`project`,`module`,`story`,`assignedTo`) + KEY `project` (`project`), + KEY `story` (`story`), + KEY `assignedTo` (`assignedTo`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_taskestimate`; CREATE TABLE IF NOT EXISTS `zt_taskestimate` ( @@ -698,7 +730,9 @@ CREATE TABLE IF NOT EXISTS `zt_testresult` ( `lastRunner` varchar(30) NOT NULL, `date` datetime NOT NULL, PRIMARY KEY (`id`), - KEY `testresult` (`case`,`version`, `run`) + KEY `case` (`case`), + KEY `version` (`version`), + KEY `run` (`run`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_testrun`; CREATE TABLE IF NOT EXISTS `zt_testrun` ( @@ -726,7 +760,8 @@ CREATE TABLE IF NOT EXISTS `zt_testsuite` ( `lastEditedBy` char(30) NOT NULL, `lastEditedDate` datetime NOT NULL, `deleted` enum('0','1') NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `product` (`product`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_testtask`; CREATE TABLE IF NOT EXISTS `zt_testtask` ( @@ -745,6 +780,7 @@ CREATE TABLE IF NOT EXISTS `zt_testtask` ( `status` enum('blocked','doing','wait','done') NOT NULL DEFAULT 'wait', `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), + KEY `product` (`product`), KEY `build` (`build`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_todo`; @@ -771,7 +807,10 @@ CREATE TABLE IF NOT EXISTS `zt_todo` ( `closedBy` varchar(30) NOT NULL DEFAULT '', `closedDate` datetime NOT NULL, PRIMARY KEY (`id`), - KEY `todo` (`account`,`date`) + KEY `account` (`account`), + KEY `assignedTo` (`assignedTo`), + KEY `finishedBy` (`finishedBy`), + KEY `date` (`date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_user`; CREATE TABLE IF NOT EXISTS `zt_user` ( @@ -808,7 +847,9 @@ CREATE TABLE IF NOT EXISTS `zt_user` ( `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), UNIQUE KEY `account` (`account`), - KEY `user` (`dept`,`email`,`commiter`) + KEY `dept` (`dept`), + KEY `email` (`email`), + KEY `commiter` (`commiter`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_usercontact`; CREATE TABLE IF NOT EXISTS `zt_usercontact` ( @@ -835,7 +876,8 @@ CREATE TABLE IF NOT EXISTS `zt_userquery` ( `sql` text NOT NULL, `shortcut` enum('0','1') NOT NULL DEFAULT '0', PRIMARY KEY (`id`), - KEY `query` (`account`, `module`) + KEY `account` (`account`), + KEY `module` (`module`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_usertpl`; CREATE TABLE IF NOT EXISTS `zt_usertpl` ( diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index 9f60b090d6..814beff05c 100755 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -51,7 +51,7 @@ $(function() } } }); - }, 90 * 1000); + }, 5 * 60 * 1000); }) sso->redirect)):?> From 946185667f75b035209a3911b98983358a14046c Mon Sep 17 00:00:00 2001 From: liugang Date: Thu, 5 Jul 2018 10:08:47 +0800 Subject: [PATCH 03/18] * Finish task #4620 --- db/zentao.sql | 284 +++++++++++++++++---------------- module/group/lang/resource.php | 17 +- module/my/view/todo.html.php | 26 ++- module/todo/control.php | 25 ++- module/todo/lang/en.php | 1 + module/todo/lang/zh-cn.php | 1 + module/todo/lang/zh-tw.php | 1 + 7 files changed, 209 insertions(+), 146 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index b0abac0d50..8cb5439340 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1326,17 +1326,21 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'testtask', 'report'), (1, 'testtask', 'unlinkcase'), (1, 'testtask', 'view'), -(1, 'todo', 'batchCreate'), -(1, 'todo', 'batchEdit'), -(1, 'todo', 'batchFinish'), -(1, 'todo', 'create'), -(1, 'todo', 'createCycle'), -(1, 'todo', 'delete'), -(1, 'todo', 'edit'), -(1, 'todo', 'export'), -(1, 'todo', 'finish'), -(1, 'todo', 'import2Today'), -(1, 'todo', 'view'), +(1, 'todo', 'activate', +(1, 'todo', 'assignTo', +(1, 'todo', 'batchClose', +(1, 'todo', 'batchCreate', +(1, 'todo', 'batchEdit', +(1, 'todo', 'batchFinish', +(1, 'todo', 'create', +(1, 'todo', 'createCycle', +(1, 'todo', 'close', +(1, 'todo', 'delete', +(1, 'todo', 'edit', +(1, 'todo', 'export', +(1, 'todo', 'finish', +(1, 'todo', 'import2Today', +(1, 'todo', 'view', (1, 'tree', 'browse'), (1, 'tree', 'browseTask'), (1, 'tree', 'delete'), @@ -1522,20 +1526,21 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2, 'testtask', 'index'), (2, 'testtask', 'results'), (2, 'testtask', 'view'), -(2, 'todo', 'batchCreate'), -(2, 'todo', 'batchEdit'), -(2, 'todo', 'batchFinish'), -(2, 'todo', 'create'), -(2, 'todo', 'createCycle'), -(2, 'todo', 'delete'), -(2, 'todo', 'edit'), -(2, 'todo', 'export'), -(2, 'todo', 'finish'), -(2, 'todo', 'import2Today'), -(2, 'todo', 'view'), -(2, 'todo', 'assignTo'), -(2, 'todo', 'activate'), -(2, 'todo', 'close'), +(2, 'todo', 'activate', +(2, 'todo', 'assignTo', +(2, 'todo', 'batchClose', +(2, 'todo', 'batchCreate', +(2, 'todo', 'batchEdit', +(2, 'todo', 'batchFinish', +(2, 'todo', 'create', +(2, 'todo', 'createCycle', +(2, 'todo', 'close', +(2, 'todo', 'delete', +(2, 'todo', 'edit', +(2, 'todo', 'export', +(2, 'todo', 'finish', +(2, 'todo', 'import2Today', +(2, 'todo', 'view', (2, 'user', 'bug'), (2, 'user', 'deleteContacts'), (2, 'user', 'dynamic'), @@ -1742,17 +1747,21 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3, 'testtask', 'report'), (3, 'testtask', 'unlinkcase'), (3, 'testtask', 'view'), -(3, 'todo', 'batchCreate'), -(3, 'todo', 'batchEdit'), -(3, 'todo', 'batchFinish'), -(3, 'todo', 'create'), -(3, 'todo', 'createCycle'), -(3, 'todo', 'delete'), -(3, 'todo', 'edit'), -(3, 'todo', 'export'), -(3, 'todo', 'finish'), -(3, 'todo', 'import2Today'), -(3, 'todo', 'view'), +(3, 'todo', 'activate', +(3, 'todo', 'assignTo', +(3, 'todo', 'batchClose', +(3, 'todo', 'batchCreate', +(3, 'todo', 'batchEdit', +(3, 'todo', 'batchFinish', +(3, 'todo', 'create', +(3, 'todo', 'createCycle', +(3, 'todo', 'close', +(3, 'todo', 'delete', +(3, 'todo', 'edit', +(3, 'todo', 'export', +(3, 'todo', 'finish', +(3, 'todo', 'import2Today', +(3, 'todo', 'view', (3, 'user', 'bug'), (3, 'user', 'deleteContacts'), (3, 'user', 'dynamic'), @@ -1969,20 +1978,21 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'testtask', 'index'), (4, 'testtask', 'results'), (4, 'testtask', 'view'), -(4, 'todo', 'batchCreate'), -(4, 'todo', 'batchEdit'), -(4, 'todo', 'batchFinish'), -(4, 'todo', 'create'), -(4, 'todo', 'createCycle'), -(4, 'todo', 'delete'), -(4, 'todo', 'edit'), -(4, 'todo', 'export'), -(4, 'todo', 'finish'), -(4, 'todo', 'import2Today'), -(4, 'todo', 'view'), -(4, 'todo', 'assignTo'), -(4, 'todo', 'activate'), -(4, 'todo', 'close'), +(4, 'todo', 'activate', +(4, 'todo', 'assignTo', +(4, 'todo', 'batchClose', +(4, 'todo', 'batchCreate', +(4, 'todo', 'batchEdit', +(4, 'todo', 'batchFinish', +(4, 'todo', 'create', +(4, 'todo', 'createCycle', +(4, 'todo', 'close', +(4, 'todo', 'delete', +(4, 'todo', 'edit', +(4, 'todo', 'export', +(4, 'todo', 'finish', +(4, 'todo', 'import2Today', +(4, 'todo', 'view', (4, 'tree', 'browse'), (4, 'tree', 'browseTask'), (4, 'tree', 'delete'), @@ -2232,20 +2242,21 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'testtask', 'index'), (5, 'testtask', 'results'), (5, 'testtask', 'view'), -(5, 'todo', 'batchCreate'), -(5, 'todo', 'batchEdit'), -(5, 'todo', 'batchFinish'), -(5, 'todo', 'create'), -(5, 'todo', 'createCycle'), -(5, 'todo', 'delete'), -(5, 'todo', 'edit'), -(5, 'todo', 'export'), -(5, 'todo', 'finish'), -(5, 'todo', 'import2Today'), -(5, 'todo', 'view'), -(5, 'todo', 'assignTo'), -(5, 'todo', 'activate'), -(5, 'todo', 'close'), +(5, 'todo', 'activate', +(5, 'todo', 'assignTo', +(5, 'todo', 'batchClose', +(5, 'todo', 'batchCreate', +(5, 'todo', 'batchEdit', +(5, 'todo', 'batchFinish', +(5, 'todo', 'create', +(5, 'todo', 'createCycle', +(5, 'todo', 'close', +(5, 'todo', 'delete', +(5, 'todo', 'edit', +(5, 'todo', 'export', +(5, 'todo', 'finish', +(5, 'todo', 'import2Today', +(5, 'todo', 'view', (5, 'tree', 'browse'), (5, 'tree', 'browseTask'), (5, 'tree', 'delete'), @@ -2467,20 +2478,21 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'testtask', 'index'), (6, 'testtask', 'results'), (6, 'testtask', 'view'), -(6, 'todo', 'batchCreate'), -(6, 'todo', 'batchEdit'), -(6, 'todo', 'batchFinish'), -(6, 'todo', 'create'), -(6, 'todo', 'createCycle'), -(6, 'todo', 'delete'), -(6, 'todo', 'edit'), -(6, 'todo', 'export'), -(6, 'todo', 'finish'), -(6, 'todo', 'import2Today'), -(6, 'todo', 'view'), -(6, 'todo', 'assignTo'), -(6, 'todo', 'activate'), -(6, 'todo', 'close'), +(6, 'todo', 'activate', +(6, 'todo', 'assignTo', +(6, 'todo', 'batchClose', +(6, 'todo', 'batchCreate', +(6, 'todo', 'batchEdit', +(6, 'todo', 'batchFinish', +(6, 'todo', 'create', +(6, 'todo', 'createCycle', +(6, 'todo', 'close', +(6, 'todo', 'delete', +(6, 'todo', 'edit', +(6, 'todo', 'export', +(6, 'todo', 'finish', +(6, 'todo', 'import2Today', +(6, 'todo', 'view', (6, 'tree', 'browse'), (6, 'tree', 'browseTask'), (6, 'tree', 'delete'), @@ -2714,20 +2726,21 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'testtask', 'index'), (7, 'testtask', 'results'), (7, 'testtask', 'view'), -(7, 'todo', 'batchCreate'), -(7, 'todo', 'batchEdit'), -(7, 'todo', 'batchFinish'), -(7, 'todo', 'create'), -(7, 'todo', 'createCycle'), -(7, 'todo', 'delete'), -(7, 'todo', 'edit'), -(7, 'todo', 'export'), -(7, 'todo', 'finish'), -(7, 'todo', 'import2Today'), -(7, 'todo', 'view'), -(7, 'todo', 'assignTo'), -(7, 'todo', 'activate'), -(7, 'todo', 'close'), +(7, 'todo', 'activate', +(7, 'todo', 'assignTo', +(7, 'todo', 'batchClose', +(7, 'todo', 'batchCreate', +(7, 'todo', 'batchEdit', +(7, 'todo', 'batchFinish', +(7, 'todo', 'create', +(7, 'todo', 'createCycle', +(7, 'todo', 'close', +(7, 'todo', 'delete', +(7, 'todo', 'edit', +(7, 'todo', 'export', +(7, 'todo', 'finish', +(7, 'todo', 'import2Today', +(7, 'todo', 'view', (7, 'tree', 'browse'), (7, 'tree', 'browseTask'), (7, 'tree', 'delete'), @@ -2972,20 +2985,21 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'testtask', 'report'), (8, 'testtask', 'unlinkcase'), (8, 'testtask', 'view'), -(8, 'todo', 'batchCreate'), -(8, 'todo', 'batchEdit'), -(8, 'todo', 'batchFinish'), -(8, 'todo', 'create'), -(8, 'todo', 'createCycle'), -(8, 'todo', 'delete'), -(8, 'todo', 'edit'), -(8, 'todo', 'export'), -(8, 'todo', 'finish'), -(8, 'todo', 'import2Today'), -(8, 'todo', 'view'), -(8, 'todo', 'assignTo'), -(8, 'todo', 'activate'), -(8, 'todo', 'close'), +(8, 'todo', 'activate', +(8, 'todo', 'assignTo', +(8, 'todo', 'batchClose', +(8, 'todo', 'batchCreate', +(8, 'todo', 'batchEdit', +(8, 'todo', 'batchFinish', +(8, 'todo', 'create', +(8, 'todo', 'createCycle', +(8, 'todo', 'close', +(8, 'todo', 'delete', +(8, 'todo', 'edit', +(8, 'todo', 'export', +(8, 'todo', 'finish', +(8, 'todo', 'import2Today', +(8, 'todo', 'view', (8, 'tree', 'browse'), (8, 'tree', 'browseTask'), (8, 'tree', 'delete'), @@ -3143,20 +3157,21 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'testtask', 'index'), (9, 'testtask', 'results'), (9, 'testtask', 'view'), -(9, 'todo', 'batchCreate'), -(9, 'todo', 'batchEdit'), -(9, 'todo', 'batchFinish'), -(9, 'todo', 'create'), -(9, 'todo', 'createCycle'), -(9, 'todo', 'delete'), -(9, 'todo', 'edit'), -(9, 'todo', 'export'), -(9, 'todo', 'finish'), -(9, 'todo', 'import2Today'), -(9, 'todo', 'view'), -(9, 'todo', 'assignTo'), -(9, 'todo', 'activate'), -(9, 'todo', 'close'), +(9, 'todo', 'activate', +(9, 'todo', 'assignTo', +(9, 'todo', 'batchClose', +(9, 'todo', 'batchCreate', +(9, 'todo', 'batchEdit', +(9, 'todo', 'batchFinish', +(9, 'todo', 'create', +(9, 'todo', 'createCycle', +(9, 'todo', 'close', +(9, 'todo', 'delete', +(9, 'todo', 'edit', +(9, 'todo', 'export', +(9, 'todo', 'finish', +(9, 'todo', 'import2Today', +(9, 'todo', 'view', (9, 'user', 'batchCreate'), (9, 'user', 'batchEdit'), (9, 'user', 'bug'), @@ -3262,20 +3277,21 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10, 'testsuite', 'index'), (10, 'testsuite', 'browse'), (10, 'testsuite', 'view'), -(10, 'todo', 'batchCreate'), -(10, 'todo', 'batchEdit'), -(10, 'todo', 'batchFinish'), -(10, 'todo', 'create'), -(10, 'todo', 'createCycle'), -(10, 'todo', 'delete'), -(10, 'todo', 'edit'), -(10, 'todo', 'export'), -(10, 'todo', 'finish'), -(10, 'todo', 'import2Today'), -(10, 'todo', 'view'), -(10, 'todo', 'assignTo'), -(10, 'todo', 'activate'), -(10, 'todo', 'close'), +(10, 'todo', 'activate', +(10, 'todo', 'assignTo', +(10, 'todo', 'batchClose', +(10, 'todo', 'batchCreate', +(10, 'todo', 'batchEdit', +(10, 'todo', 'batchFinish', +(10, 'todo', 'create', +(10, 'todo', 'createCycle', +(10, 'todo', 'close', +(10, 'todo', 'delete', +(10, 'todo', 'edit', +(10, 'todo', 'export', +(10, 'todo', 'finish', +(10, 'todo', 'import2Today', +(10, 'todo', 'view', (10, 'user', 'bug'), (10, 'user', 'dynamic'), (10, 'user', 'profile'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 9fc37fd752..e5b4c78c5a 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -121,16 +121,23 @@ $lang->resource->todo->import2Today = 'import2Today'; $lang->resource->todo->assignTo = 'assignTo'; $lang->resource->todo->activate = 'activate'; $lang->resource->todo->close = 'close'; +$lang->resource->todo->batchClose = 'batchClose'; $lang->todo->methodOrder[5] = 'create'; $lang->todo->methodOrder[10] = 'createCycle'; $lang->todo->methodOrder[15] = 'batchCreate'; $lang->todo->methodOrder[20] = 'edit'; -$lang->todo->methodOrder[25] = 'view'; -$lang->todo->methodOrder[30] = 'delete'; -$lang->todo->methodOrder[35] = 'export'; -$lang->todo->methodOrder[40] = 'finish'; -$lang->todo->methodOrder[45] = 'import2Today'; +$lang->todo->methodOrder[25] = 'batchEdit'; +$lang->todo->methodOrder[30] = 'view'; +$lang->todo->methodOrder[35] = 'delete'; +$lang->todo->methodOrder[40] = 'export'; +$lang->todo->methodOrder[45] = 'finish'; +$lang->todo->methodOrder[50] = 'batchFinish'; +$lang->todo->methodOrder[55] = 'import2Today'; +$lang->todo->methodOrder[60] = 'assignTo'; +$lang->todo->methodOrder[65] = 'activate'; +$lang->todo->methodOrder[70] = 'close'; +$lang->todo->methodOrder[75] = 'batchClose'; /* Product. */ $lang->resource->product = new stdclass(); diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 112897d650..daf815eec9 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -97,10 +97,23 @@ todo->statusList[$todo->status];?> status != 'done') common::printIcon('todo', 'assignto', "todoID=$todo->id", $todo, 'list', 'hand-right', '', "btn-icon", '', "data-toggle='assigntoModal' data-width='500'", $lang->todo->assignTo); - if($todo->status == 'done') common::printIcon('todo', 'activate', "id=$todo->id", $todo, 'list', 'magic', 'hiddenwin'); - if($todo->status != 'done') common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'list', 'checked', 'hiddenwin'); - if($todo->status == 'done') common::printIcon('todo', 'close', "id=$todo->id", $todo, 'list', 'off', 'hiddenwin'); + if($todo->status == 'done' or $todo->status == 'closed') + { + common::printIcon('todo', 'activate', "id=$todo->id", $todo, 'list', 'magic', 'hiddenwin'); + if($todo->status == 'done') + { + common::printIcon('todo', 'close', "id=$todo->id", $todo, 'list', 'off', 'hiddenwin'); + } + else + { + echo html::a('javascript:;', "", '', "class='btn disabled'"); + } + } + else + { + common::printIcon('todo', 'assignto', "todoID=$todo->id", $todo, 'list', 'hand-right', '', "btn-icon", '', "data-toggle='assigntoModal' data-width='500'", $lang->todo->assignTo); + common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'list', 'checked', 'hiddenwin'); + } common::printIcon('todo', 'edit', "id=$todo->id", '', 'list', 'edit', '', 'iframe', true); if(common::hasPriv('todo', 'delete')) @@ -131,6 +144,11 @@ $actionLink = $this->createLink('todo', 'batchFinish'); echo html::commonButton($lang->todo->finish, "onclick=\"setFormAction('$actionLink','hiddenwin')\""); } + if(common::hasPriv('todo', 'batchClose')) + { + $actionLink = $this->createLink('todo', 'batchClose'); + echo html::commonButton($lang->todo->close, "onclick=\"setFormAction('$actionLink','hiddenwin')\""); + } if(common::hasPriv('todo', 'import2Today') and $importFuture) { $actionLink = $this->createLink('todo', 'import2Today'); diff --git a/module/todo/control.php b/module/todo/control.php index be605d5de5..be5b54e75f 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -251,7 +251,7 @@ class todo extends control public function activate($todoID) { $todo = $this->todo->getById($todoID); - if($todo->status == 'done') $this->todo->activate($todoID); + if($todo->status == 'done' or $todo->status == 'closed') $this->todo->activate($todoID); if(isonlybody()) die(js::reload('parent.parent')); die(js::reload('parent')); } @@ -396,7 +396,7 @@ class todo extends control public function finish($todoID) { $todo = $this->todo->getById($todoID); - if($todo->status != 'done') $this->todo->finish($todoID); + if($todo->status != 'done' && $todo->status != 'closed') $this->todo->finish($todoID); if(in_array($todo->type, array('bug', 'task', 'story'))) { $confirmNote = 'confirm' . ucfirst($todo->type); @@ -421,7 +421,26 @@ class todo extends control foreach($_POST['todoIDList'] as $todoID) { $todo = $this->todo->getById($todoID); - if($todo->status != 'done') $this->todo->finish($todoID); + if($todo->status != 'done' && $todo->status != 'closed') $this->todo->finish($todoID); + } + die(js::reload('parent')); + } + } + + /** + * Batch close todos. + * + * @access public + * @return void + */ + public function batchClose() + { + if(!empty($_POST['todoIDList'])) + { + foreach($_POST['todoIDList'] as $todoID) + { + $todo = $this->todo->getById($todoID); + if($todo->status == 'done') $this->todo->close($todoID); } die(js::reload('parent')); } diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 92300602f3..b60880779a 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -18,6 +18,7 @@ $lang->todo->activate = "Activate"; $lang->todo->batchCreate = "Batch Add"; $lang->todo->edit = "Edit"; $lang->todo->close = "Close"; +$lang->todo->batchClose = "Batch Close"; $lang->todo->batchEdit = "Batch Edit"; $lang->todo->view = "Overview"; $lang->todo->finish = "Finish"; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index b585cda17d..d2232b52eb 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -18,6 +18,7 @@ $lang->todo->activate = "激活"; $lang->todo->batchCreate = "批量添加"; $lang->todo->edit = "编辑"; $lang->todo->close = "关闭"; +$lang->todo->batchClose = "批量关闭"; $lang->todo->batchEdit = "批量编辑"; $lang->todo->view = "待办详情"; $lang->todo->finish = "完成"; diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php index c929c27f2b..feb9ec6219 100644 --- a/module/todo/lang/zh-tw.php +++ b/module/todo/lang/zh-tw.php @@ -18,6 +18,7 @@ $lang->todo->activate = "激活"; $lang->todo->batchCreate = "批量添加"; $lang->todo->edit = "編輯"; $lang->todo->close = "關閉"; +$lang->todo->batchClose = "批量關閉"; $lang->todo->batchEdit = "批量編輯"; $lang->todo->view = "待辦詳情"; $lang->todo->finish = "完成"; From 95149dcda13bf99d2a7299f60ce8f88c7574d7e2 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 5 Jul 2018 10:17:24 +0800 Subject: [PATCH 04/18] * delete useless table. --- db/zentao.sql | 27 --------------------------- module/dev/config.php | 1 - module/dev/lang/en.php | 2 -- module/dev/lang/zh-cn.php | 2 -- 4 files changed, 32 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 93ef040c4e..d6831dbcd8 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -397,21 +397,6 @@ CREATE TABLE IF NOT EXISTS `zt_history` ( PRIMARY KEY (`id`), KEY `action` (`action`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; --- DROP TABLE IF EXISTS `zt_mailqueue`; -CREATE TABLE IF NOT EXISTS `zt_mailqueue` ( - `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, - `toList` varchar(255) NOT NULL, - `ccList` varchar(255) NOT NULL, - `subject` varchar(255) NOT NULL, - `body` text NOT NULL, - `addedBy` char(30) NOT NULL, - `addedDate` datetime NOT NULL, - `sendTime` datetime NOT NULL, - `status` varchar(10) NOT NULL DEFAULT 'wait', - `failReason` text NOT NULL, - PRIMARY KEY (`id`), - KEY `sendTime` (`sendTime`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_module`; CREATE TABLE IF NOT EXISTS `zt_module` ( `id` mediumint(8) unsigned NOT NULL auto_increment, @@ -925,18 +910,6 @@ CREATE TABLE IF NOT EXISTS `zt_webhook` ( `deleted` enum('0', '1') NOT NULL DEFAULT '0', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; --- DROP TABLE IF EXISTS `zt_webhookdatas`; -CREATE TABLE IF NOT EXISTS `zt_webhookdatas` ( - `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, - `webhook` mediumint(8) unsigned NOT NULL, - `action` mediumint(8) unsigned NOT NULL, - `data` text NOT NULL, - `status` enum('wait', 'sended') NOT NULL DEFAULT 'wait', - `createdBy` varchar(30) NOT NULL, - `createdDate` datetime NOT NULL, - PRIMARY KEY `id` (`id`), - UNIQUE KEY `uniq` (`webhook`, `action`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_log`; CREATE TABLE IF NOT EXISTS `zt_log` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, diff --git a/module/dev/config.php b/module/dev/config.php index db376d358a..9038c543cd 100644 --- a/module/dev/config.php +++ b/module/dev/config.php @@ -71,6 +71,5 @@ $config->dev->tableMap['usertpl'] = 'user-tpl'; $config->dev->tableMap['history'] = 'action-history'; $config->dev->tableMap['lang'] = 'custom'; $config->dev->tableMap['config'] = 'custom'; -$config->dev->tableMap['mailqueue'] = 'mail'; $config->dev->tableMap['module'] = 'tree'; $config->dev->tableMap['suitecase'] = 'testcase'; diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php index 004d3ad908..da94bcf8c2 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -82,7 +82,6 @@ $lang->dev->tableList['testsuite'] = 'Test Suite'; $lang->dev->tableList['tree'] = 'Module Tree'; $lang->dev->tableList['upgrade'] = 'Update'; $lang->dev->tableList['cron'] = 'Scheduled Task'; -$lang->dev->tableList['mailqueue'] = 'Mail Queue'; $lang->dev->tableList['datatable'] = 'Data Table'; $lang->dev->tableList['block'] = 'Block'; $lang->dev->tableList['branch'] = 'Branch'; @@ -93,7 +92,6 @@ $lang->dev->tableList['suitecase'] = 'Suite Case'; $lang->dev->tableList['score'] = 'Score'; $lang->dev->tableList['entry'] = 'Entry'; $lang->dev->tableList['webhook'] = 'WebHook'; -$lang->dev->tableList['webhookdatas'] = 'WebHookDatas'; $lang->dev->tableList['log'] = 'Log'; $lang->dev->tableList['message'] = 'Message'; $lang->dev->tableList['notify'] = 'Notify'; diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php index 8e9ab8ac3a..ab1f223791 100644 --- a/module/dev/lang/zh-cn.php +++ b/module/dev/lang/zh-cn.php @@ -82,7 +82,6 @@ $lang->dev->tableList['testsuite'] = '测试套件'; $lang->dev->tableList['tree'] = '模块关系'; $lang->dev->tableList['upgrade'] = '更新'; $lang->dev->tableList['cron'] = '定时任务'; -$lang->dev->tableList['mailqueue'] = '邮件队列'; $lang->dev->tableList['datatable'] = '数据表格'; $lang->dev->tableList['block'] = '区块'; $lang->dev->tableList['branch'] = '平台/分支'; @@ -93,7 +92,6 @@ $lang->dev->tableList['suitecase'] = '套件用例'; $lang->dev->tableList['score'] = '积分'; $lang->dev->tableList['entry'] = '应用'; $lang->dev->tableList['webhook'] = 'WebHook'; -$lang->dev->tableList['webhookdatas'] = 'WebHook数据'; $lang->dev->tableList['log'] = '接口日志'; $lang->dev->tableList['message'] = '消息'; $lang->dev->tableList['notify'] = '通知'; From 5baae8f3ff46a4d7cdf697648e2ffa6e54dbb906 Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 5 Jul 2018 10:24:09 +0800 Subject: [PATCH 05/18] * refactor code. --- module/common/view/action.html.php | 4 +--- module/todo/view/view.html.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index ea779ef062..fb3a948795 100755 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -1,12 +1,10 @@ getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> -
+