From 8eea52f59747e211dc63fb5acb5a5391f6f51ee4 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 11 Apr 2023 09:21:50 +0000 Subject: [PATCH 1/2] * Change the default privileges from report to pivot. --- db/zentao.sql | 387 +++++++++++++++++++++++++------------------------- 1 file changed, 193 insertions(+), 194 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 40af3c18f5..8de22949ba 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2517,12 +2517,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'repo','setRules'), (1,'repo','showSyncCommit'), (1,'repo','view'), -(1,'report','bugAssign'), -(1,'report','bugCreate'), -(1,'report','index'), -(1,'report','productSummary'), -(1,'report','projectDeviation'), -(1,'report','workload'), +(1,'pivot','preview'), +(1,'pivot','bugAssign'), +(1,'pivot','bugCreate'), +(1,'pivot','productSummary'), +(1,'pivot','projectDeviation'), +(1,'pivot','workload'), (1,'search','buildForm'), (1,'search','buildIndex'), (1,'search','buildQuery'), @@ -2950,12 +2950,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'repo','revision'), (2,'repo','showSyncCommit'), (2,'repo','view'), -(2,'report','bugAssign'), -(2,'report','bugCreate'), -(2,'report','index'), -(2,'report','productSummary'), -(2,'report','projectDeviation'), -(2,'report','workload'), +(2,'pivot','preview'), +(2,'pivot','bugAssign'), +(2,'pivot','bugCreate'), +(2,'pivot','productSummary'), +(2,'pivot','projectDeviation'), +(2,'pivot','workload'), (2,'search','buildForm'), (2,'search','buildIndex'), (2,'search','buildQuery'), @@ -3249,12 +3249,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'repo','revision'), (3,'repo','showSyncCommit'), (3,'repo','view'), -(3,'report','bugAssign'), -(3,'report','bugCreate'), -(3,'report','index'), -(3,'report','productSummary'), -(3,'report','projectDeviation'), -(3,'report','workload'), +(3,'pivot','preview'), +(3,'pivot','bugAssign'), +(3,'pivot','bugCreate'), +(3,'pivot','productSummary'), +(3,'pivot','projectDeviation'), +(3,'pivot','workload'), (3,'search','buildForm'), (3,'search','buildQuery'), (3,'search','deleteQuery'), @@ -3713,12 +3713,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'repo','setRules'), (4,'repo','showSyncCommit'), (4,'repo','view'), -(4,'report','bugAssign'), -(4,'report','bugCreate'), -(4,'report','index'), -(4,'report','productSummary'), -(4,'report','projectDeviation'), -(4,'report','workload'), +(4,'pivot','preview'), +(4,'pivot','bugAssign'), +(4,'pivot','bugCreate'), +(4,'pivot','productSummary'), +(4,'pivot','projectDeviation'), +(4,'pivot','workload'), (4,'search','buildForm'), (4,'search','buildQuery'), (4,'search','deleteQuery'), @@ -4235,12 +4235,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'repo','setRules'), (5,'repo','showSyncCommit'), (5,'repo','view'), -(5,'report','bugAssign'), -(5,'report','bugCreate'), -(5,'report','index'), -(5,'report','productSummary'), -(5,'report','projectDeviation'), -(5,'report','workload'), +(5,'pivot','preview'), +(5,'pivot','bugAssign'), +(5,'pivot','bugCreate'), +(5,'pivot','productSummary'), +(5,'pivot','projectDeviation'), +(5,'pivot','workload'), (5,'search','buildForm'), (5,'search','buildQuery'), (5,'search','deleteQuery'), @@ -4655,12 +4655,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'repo','revision'), (6,'repo','showSyncCommit'), (6,'repo','view'), -(6,'report','bugAssign'), -(6,'report','bugCreate'), -(6,'report','index'), -(6,'report','productSummary'), -(6,'report','projectDeviation'), -(6,'report','workload'), +(6,'pivot','preview'), +(6,'pivot','bugAssign'), +(6,'pivot','bugCreate'), +(6,'pivot','productSummary'), +(6,'pivot','projectDeviation'), +(6,'pivot','workload'), (6,'search','buildForm'), (6,'search','buildQuery'), (6,'search','deleteQuery'), @@ -5044,12 +5044,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'repo','revision'), (7,'repo','showSyncCommit'), (7,'repo','view'), -(7,'report','bugAssign'), -(7,'report','bugCreate'), -(7,'report','index'), -(7,'report','productSummary'), -(7,'report','projectDeviation'), -(7,'report','workload'), +(7,'pivot','preview'), +(7,'pivot','bugAssign'), +(7,'pivot','bugCreate'), +(7,'pivot','productSummary'), +(7,'pivot','projectDeviation'), +(7,'pivot','workload'), (7,'search','buildForm'), (7,'search','buildQuery'), (7,'search','deleteQuery'), @@ -5445,12 +5445,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'repo','revision'), (8,'repo','showSyncCommit'), (8,'repo','view'), -(8,'report','bugAssign'), -(8,'report','bugCreate'), -(8,'report','index'), -(8,'report','productSummary'), -(8,'report','projectDeviation'), -(8,'report','workload'), +(8,'pivot','preview'), +(8,'pivot','bugAssign'), +(8,'pivot','bugCreate'), +(8,'pivot','productSummary'), +(8,'pivot','projectDeviation'), +(8,'pivot','workload'), (8,'search','buildForm'), (8,'search','buildQuery'), (8,'search','deleteQuery'), @@ -5820,12 +5820,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'repo','revision'), (9,'repo','showSyncCommit'), (9,'repo','view'), -(9,'report','bugAssign'), -(9,'report','bugCreate'), -(9,'report','index'), -(9,'report','productSummary'), -(9,'report','projectDeviation'), -(9,'report','workload'), +(9,'pivot','preview'), +(9,'pivot','bugAssign'), +(9,'pivot','bugCreate'), +(9,'pivot','productSummary'), +(9,'pivot','projectDeviation'), +(9,'pivot','workload'), (9,'search','buildForm'), (9,'search','buildQuery'), (9,'search','deleteQuery'), @@ -6092,12 +6092,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10,'repo','revision'), (10,'repo','showSyncCommit'), (10,'repo','view'), -(10,'report','bugAssign'), -(10,'report','bugCreate'), -(10,'report','index'), -(10,'report','productSummary'), -(10,'report','projectDeviation'), -(10,'report','workload'), +(10,'pivot','preview'), +(10,'pivot','bugAssign'), +(10,'pivot','bugCreate'), +(10,'pivot','productSummary'), +(10,'pivot','projectDeviation'), +(10,'pivot','workload'), (10,'search','buildForm'), (10,'search','buildQuery'), (10,'search','deleteQuery'), @@ -6344,12 +6344,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'repo','log'), (11,'repo','revision'), (11,'repo','view'), -(11,'report','bugAssign'), -(11,'report','bugCreate'), -(11,'report','index'), -(11,'report','productSummary'), -(11,'report','projectDeviation'), -(11,'report','workload'), +(11,'pivot','preview'), +(11,'pivot','bugAssign'), +(11,'pivot','bugCreate'), +(11,'pivot','productSummary'), +(11,'pivot','projectDeviation'), +(11,'pivot','workload'), (11,'search','buildForm'), (11,'search','buildQuery'), (11,'search','deleteQuery'), @@ -6997,133 +6997,133 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'repo','editBug'), (9,'repo','editComment'); REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES -(1,'report','bugAssignSummary'), -(1,'report','bugSummary'), -(1,'report','build'), -(1,'report','casesrun'), -(1,'report','projectSummary'), -(1,'report','projectWorkload'), -(1,'report','reportExport'), -(1,'report','roadmap'), -(1,'report','storyLinkedBug'), -(1,'report','testcase'), -(1,'report','workAssignSummary'), -(1,'report','workSummary'), -(2,'report','bugAssignSummary'), -(2,'report','bugSummary'), -(2,'report','build'), -(2,'report','casesrun'), -(2,'report','projectSummary'), -(2,'report','projectWorkload'), -(2,'report','roadmap'), -(2,'report','storyLinkedBug'), -(2,'report','testcase'), -(2,'report','workAssignSummary'), -(2,'report','workSummary'), -(3,'report','bugAssignSummary'), -(3,'report','bugSummary'), -(3,'report','build'), -(3,'report','casesrun'), -(3,'report','projectSummary'), -(3,'report','projectWorkload'), -(3,'report','roadmap'), -(3,'report','storyLinkedBug'), -(3,'report','testcase'), -(3,'report','workAssignSummary'), -(3,'report','workSummary'), -(4,'report','bugAssignSummary'), -(4,'report','bugSummary'), -(4,'report','build'), -(4,'report','casesrun'), -(4,'report','projectSummary'), -(4,'report','projectWorkload'), -(4,'report','reportExport'), -(4,'report','roadmap'), -(4,'report','storyLinkedBug'), -(4,'report','testcase'), -(4,'report','workAssignSummary'), -(4,'report','workSummary'), -(5,'report','bugAssignSummary'), -(5,'report','bugSummary'), -(5,'report','build'), -(5,'report','casesrun'), -(5,'report','projectSummary'), -(5,'report','projectWorkload'), -(5,'report','reportExport'), -(5,'report','roadmap'), -(5,'report','storyLinkedBug'), -(5,'report','testcase'), -(5,'report','workAssignSummary'), -(5,'report','workSummary'), -(6,'report','bugAssignSummary'), -(6,'report','bugSummary'), -(6,'report','build'), -(6,'report','casesrun'), -(6,'report','projectSummary'), -(6,'report','projectWorkload'), -(6,'report','roadmap'), -(6,'report','storyLinkedBug'), -(6,'report','testcase'), -(6,'report','workAssignSummary'), -(6,'report','workSummary'), -(7,'report','bugAssignSummary'), -(7,'report','bugSummary'), -(7,'report','build'), -(7,'report','casesrun'), -(7,'report','projectSummary'), -(7,'report','projectWorkload'), -(7,'report','reportExport'), -(7,'report','roadmap'), -(7,'report','storyLinkedBug'), -(7,'report','testcase'), -(7,'report','workAssignSummary'), -(7,'report','workSummary'), -(8,'report','bugAssignSummary'), -(8,'report','bugSummary'), -(8,'report','build'), -(8,'report','casesrun'), -(8,'report','projectSummary'), -(8,'report','projectWorkload'), -(8,'report','roadmap'), -(8,'report','storyLinkedBug'), -(8,'report','testcase'), -(8,'report','workAssignSummary'), -(8,'report','workSummary'), -(9,'report','bugAssignSummary'), -(9,'report','bugSummary'), -(9,'report','build'), -(9,'report','casesrun'), -(9,'report','projectSummary'), -(9,'report','projectWorkload'), -(9,'report','reportExport'), -(9,'report','roadmap'), -(9,'report','storyLinkedBug'), -(9,'report','testcase'), -(9,'report','workAssignSummary'), -(9,'report','workSummary'), -(10,'report','bugAssignSummary'), -(10,'report','bugSummary'), -(10,'report','build'), -(10,'report','casesrun'), -(10,'report','projectSummary'), -(10,'report','projectWorkload'), -(10,'report','reportExport'), -(10,'report','roadmap'), -(10,'report','storyLinkedBug'), -(10,'report','testcase'), -(10,'report','workAssignSummary'), -(10,'report','workSummary'), -(11,'report','bugAssignSummary'), -(11,'report','bugSummary'), -(11,'report','build'), -(11,'report','casesrun'), -(11,'report','projectSummary'), -(11,'report','projectWorkload'), -(11,'report','roadmap'), -(11,'report','storyLinkedBug'), -(11,'report','testcase'), -(11,'report','workAssignSummary'), -(11,'report','workSummary'); +(1,'pivot','bugAssignSummary'), +(1,'pivot','bugSummary'), +(1,'pivot','build'), +(1,'pivot','casesrun'), +(1,'pivot','projectSummary'), +(1,'pivot','projectWorkload'), +(1,'pivot','reportExport'), +(1,'pivot','roadmap'), +(1,'pivot','storyLinkedBug'), +(1,'pivot','testcase'), +(1,'pivot','workAssignSummary'), +(1,'pivot','workSummary'), +(2,'pivot','bugAssignSummary'), +(2,'pivot','bugSummary'), +(2,'pivot','build'), +(2,'pivot','casesrun'), +(2,'pivot','projectSummary'), +(2,'pivot','projectWorkload'), +(2,'pivot','roadmap'), +(2,'pivot','storyLinkedBug'), +(2,'pivot','testcase'), +(2,'pivot','workAssignSummary'), +(2,'pivot','workSummary'), +(3,'pivot','bugAssignSummary'), +(3,'pivot','bugSummary'), +(3,'pivot','build'), +(3,'pivot','casesrun'), +(3,'pivot','projectSummary'), +(3,'pivot','projectWorkload'), +(3,'pivot','roadmap'), +(3,'pivot','storyLinkedBug'), +(3,'pivot','testcase'), +(3,'pivot','workAssignSummary'), +(3,'pivot','workSummary'), +(4,'pivot','bugAssignSummary'), +(4,'pivot','bugSummary'), +(4,'pivot','build'), +(4,'pivot','casesrun'), +(4,'pivot','projectSummary'), +(4,'pivot','projectWorkload'), +(4,'pivot','reportExport'), +(4,'pivot','roadmap'), +(4,'pivot','storyLinkedBug'), +(4,'pivot','testcase'), +(4,'pivot','workAssignSummary'), +(4,'pivot','workSummary'), +(5,'pivot','bugAssignSummary'), +(5,'pivot','bugSummary'), +(5,'pivot','build'), +(5,'pivot','casesrun'), +(5,'pivot','projectSummary'), +(5,'pivot','projectWorkload'), +(5,'pivot','reportExport'), +(5,'pivot','roadmap'), +(5,'pivot','storyLinkedBug'), +(5,'pivot','testcase'), +(5,'pivot','workAssignSummary'), +(5,'pivot','workSummary'), +(6,'pivot','bugAssignSummary'), +(6,'pivot','bugSummary'), +(6,'pivot','build'), +(6,'pivot','casesrun'), +(6,'pivot','projectSummary'), +(6,'pivot','projectWorkload'), +(6,'pivot','roadmap'), +(6,'pivot','storyLinkedBug'), +(6,'pivot','testcase'), +(6,'pivot','workAssignSummary'), +(6,'pivot','workSummary'), +(7,'pivot','bugAssignSummary'), +(7,'pivot','bugSummary'), +(7,'pivot','build'), +(7,'pivot','casesrun'), +(7,'pivot','projectSummary'), +(7,'pivot','projectWorkload'), +(7,'pivot','reportExport'), +(7,'pivot','roadmap'), +(7,'pivot','storyLinkedBug'), +(7,'pivot','testcase'), +(7,'pivot','workAssignSummary'), +(7,'pivot','workSummary'), +(8,'pivot','bugAssignSummary'), +(8,'pivot','bugSummary'), +(8,'pivot','build'), +(8,'pivot','casesrun'), +(8,'pivot','projectSummary'), +(8,'pivot','projectWorkload'), +(8,'pivot','roadmap'), +(8,'pivot','storyLinkedBug'), +(8,'pivot','testcase'), +(8,'pivot','workAssignSummary'), +(8,'pivot','workSummary'), +(9,'pivot','bugAssignSummary'), +(9,'pivot','bugSummary'), +(9,'pivot','build'), +(9,'pivot','casesrun'), +(9,'pivot','projectSummary'), +(9,'pivot','projectWorkload'), +(9,'pivot','reportExport'), +(9,'pivot','roadmap'), +(9,'pivot','storyLinkedBug'), +(9,'pivot','testcase'), +(9,'pivot','workAssignSummary'), +(9,'pivot','workSummary'), +(10,'pivot','bugAssignSummary'), +(10,'pivot','bugSummary'), +(10,'pivot','build'), +(10,'pivot','casesrun'), +(10,'pivot','projectSummary'), +(10,'pivot','projectWorkload'), +(10,'pivot','reportExport'), +(10,'pivot','roadmap'), +(10,'pivot','storyLinkedBug'), +(10,'pivot','testcase'), +(10,'pivot','workAssignSummary'), +(10,'pivot','workSummary'), +(11,'pivot','bugAssignSummary'), +(11,'pivot','bugSummary'), +(11,'pivot','build'), +(11,'pivot','casesrun'), +(11,'pivot','projectSummary'), +(11,'pivot','projectWorkload'), +(11,'pivot','roadmap'), +(11,'pivot','storyLinkedBug'), +(11,'pivot','testcase'), +(11,'pivot','workAssignSummary'), +(11,'pivot','workSummary'); REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'ldap','index'), @@ -7193,7 +7193,6 @@ CREATE OR REPLACE VIEW `ztv_normalproduct` AS SELECT * FROM `zt_product` WHERE ` --('project-progress', '{\"zh-cn\":\"\\u9879\\u76ee\\u8fdb\\u5c55\\u8868\",\"zh-tw\":\"\\u9805\\u76ee\\u9032\\u5c55\\u8868\",\"en\":\"Project Progress Report\",\"de\":\"Project Progress Report\",\"fr\":\"Project Progress Report\",\"vi\":\"Project Progress Report\",\"ja\":\"Project Progress Report\"}', ',project', 'select t1.id,t4.name as project,t4.id,IF(t4.multiple="1",t1.name,"") as execution,t1.status,t2.number as tasks,round(t2.consumed,2) as consumed,round(t2.`left`,2) as `left`,t3.stories,t2.undone as undoneTask,t3.undone as undoneStory,t2.totalReal from TABLE_EXECUTION as t1 \r\nleft join ztv_executionsummary as t2 on t1.id=t2.execution\r\nleft join ztv_projectstories as t3 on t1.id=t3.execution\r\nleft join TABLE_PROJECT as t4 on t4.id=t1.project\r\nwhere t1.deleted=\'0\' and t1.type in (\'sprint\',\'stage\') and if($project=\'\',1,t4.id=$project) and if($execution=\'\',1,t1.id=$execution) and if($status=\'\',1,t1.status=$status)', '{\"varName\":[\"project\",\"execution\",\"status\"],\"showName\":[\"\\u9879\\u76ee\\u5217\\u8868\",\"\\u6267\\u884c\\u5217\\u8868\",\"\\u6267\\u884c\\u72b6\\u6001\"],\"requestType\":[\"select\",\"select\",\"select\"],\"selectList\":[\"project\",\"execution\",\"project.status\"],\"default\":[\"\",\"\",\"\"]}', '{\"stories\":{\"zh-cn\":\"\\u9700\\u6c42\\u6570\",\"zh-tw\":\"\\u9700\\u6c42\\u6570\",\"en\":\"Stories\"},\"tasks\":{\"zh-cn\":\"\\u4efb\\u52a1\\u6570\",\"zh-tw\":\"\\u4efb\\u52a1\\u6570\",\"en\":\"Tasks\"},\"undoneStory\":{\"zh-cn\":\"\\u5269\\u4f59\\u9700\\u6c42\\u6570\",\"zh-tw\":\"\\u5269\\u4f59\\u9700\\u6c42\\u6570\",\"en\":\"Undone Story\"},\"undoneTask\":{\"zh-cn\":\"\\u5269\\u4f59\\u4efb\\u52a1\\u6570\",\"zh-tw\":\"\\u5269\\u4f59\\u4efb\\u52a1\\u6570\",\"en\":\"Undone Task\"},\"consumed\":{\"zh-cn\":\"\\u5df2\\u6d88\\u8017\\u5de5\\u65f6\",\"zh-tw\":\"\\u5df2\\u6d88\\u8017\\u5de5\\u65f6\",\"en\":\"Cost(h)\"},\"left\":{\"zh-cn\":\"\\u5269\\u4f59\\u5de5\\u65f6\",\"zh-tw\":\"\\u5269\\u4f59\\u5de5\\u65f6\",\"en\":\"Left(h)\"},\"consumedPercent\":{\"zh-cn\":\"\\u8fdb\\u5ea6\",\"zh-tw\":\"\\u8fdb\\u5ea6\",\"en\":\"Process\"},\"execution\":{\"zh-cn\":\"\\u6267\\u884c\\u540d\\u79f0\"}}', '{\"group1\":\"project\",\"group2\":\"execution\",\"reportField\":[\"stories\",\"undoneStory\",\"tasks\",\"undoneTask\",\"left\",\"consumed\"],\"reportType\":[\"sum\",\"sum\",\"sum\",\"sum\",\"sum\",\"sum\"],\"sumAppend\":[\"stories\",\"undoneStory\",\"tasks\",\"undoneTask\",\"left\",\"consumed\"],\"percent\":{\"5\":\"1\"},\"contrast\":{\"5\":\"totalReal\"},\"showAlone\":{\"5\":\"1\"}}', 2, '{\"zh-cn\":\"\\u9879\\u76ee\\u7684\\u9700\\u6c42\\u6570\\uff0c\\u4efb\\u52a1\\u6570\\uff0c\\u5df2\\u6d88\\u8017\\u5de5\\u65f6\\uff0c\\u5269\\u4f59\\u5de5\\u65f6\\uff0c\\u5269\\u4f59\\u9700\\u6c42\\u6570\\uff0c\\u5269\\u4f59\\u4efb\\u52a1\\u6570\\uff0c\\u8fdb\\u5ea6\\u3002\",\"zh-tw\":\"\\u9805\\u76ee\\u7684\\u9700\\u6c42\\u6578\\uff0c\\u4efb\\u52d9\\u6578\\uff0c\\u5df2\\u6d88\\u8017\\u5de5\\u6642\\uff0c\\u5269\\u9918\\u5de5\\u6642\\uff0c\\u5269\\u9918\\u9700\\u6c42\\u6578\\uff0c\\u5269\\u9918\\u4efb\\u52d9\\u6578\\uff0c\\u9032\\u5ea6\\u3002\",\"en\":\"\",\"de\":\"\",\"fr\":\"\",\"vi\":\"\",\"ja\":\"\"}', 'admin', '2015-07-23 14:03:06'), --('projectbug-type', '{\"zh-cn\":\"\\u9879\\u76eeBug\\u7c7b\\u578b\\u7edf\\u8ba1\\u8868\",\"zh-tw\":\"\\u9805\\u76eeBug\\u985e\\u578b\\u7d71\\u8a08\\u8868\",\"en\":\"Project Bug Type\",\"de\":\"Project Bug Type\",\"fr\":\"Project Bug Type\",\"vi\":\"Project Bug Type\",\"ja\":\"Project Bug Type\"}', ',project,test', 'select t1.id,t3.name as project,t3.id,IF(t3.multiple="1",t1.name,"") as execution,t2.id as bugID,t2.type from TABLE_EXECUTION as t1 \r\nleft join TABLE_BUG as t2 on t1.id=t2.execution\r\nleft join TABLE_PROJECT as t3 on t3.id=t1.project\r\nwhere t1.deleted=\'0\' and t2.deleted=\'0\' and if($project=\'\',1,t3.id=$project) and if($execution=\'\',1,t1.id=$execution)', '{\"varName\":[\"project\",\"execution\"],\"showName\":[\"\\u9879\\u76ee\\u5217\\u8868\",\"\\u6267\\u884c\\u5217\\u8868\"],\"requestType\":[\"select\",\"select\"],\"selectList\":[\"project\",\"execution\"],\"default\":[\"\",\"\"]}', '{\"stories\":{\"zh-cn\":\"\\u9700\\u6c42\\u6570\",\"zh-tw\":\"\\u9700\\u6c42\\u6570\",\"en\":\"Stories\"},\"tasks\":{\"zh-cn\":\"\\u4efb\\u52a1\\u6570\",\"zh-tw\":\"\\u4efb\\u52a1\\u6570\",\"en\":\"Tasks\"},\"undoneStory\":{\"zh-cn\":\"\\u5269\\u4f59\\u9700\\u6c42\\u6570\",\"zh-tw\":\"\\u5269\\u4f59\\u9700\\u6c42\\u6570\",\"en\":\"Undone Story\"},\"undoneTask\":{\"zh-cn\":\"\\u5269\\u4f59\\u4efb\\u52a1\\u6570\",\"zh-tw\":\"\\u5269\\u4f59\\u4efb\\u52a1\\u6570\",\"en\":\"Undone Task\"},\"consumed\":{\"zh-cn\":\"\\u5df2\\u6d88\\u8017\\u5de5\\u65f6\",\"zh-tw\":\"\\u5df2\\u6d88\\u8017\\u5de5\\u65f6\",\"en\":\"Cost(h)\"},\"left\":{\"zh-cn\":\"\\u5269\\u4f59\\u5de5\\u65f6\",\"zh-tw\":\"\\u5269\\u4f59\\u5de5\\u65f6\",\"en\":\"Left(h)\"},\"consumedPercent\":{\"zh-cn\":\"\\u8fdb\\u5ea6\",\"zh-tw\":\"\\u8fdb\\u5ea6\",\"en\":\"Process\"},\"execution\":{\"zh-cn\":\"\\u6267\\u884c\\u540d\\u79f0\"}}', '{\"group1\":\"project\",\"group2\":\"execution\",\"reportField\":[\"type\"],\"reportType\":[\"count\"],\"sumAppend\":[\"\"]}', 2, '{\"zh-cn\":\"\\u6309\\u7167\\u9879\\u76ee\\u7edf\\u8ba1Bug\\u7684\\u7c7b\\u578b\\u5206\\u5e03\\u60c5\\u51b5\\u3002\",\"zh-tw\":\"\\u6309\\u7167\\u9805\\u76ee\\u7d71\\u8a08Bug\\u7684\\u985e\\u578b\\u5206\\u5e03\\u60c5\\u6cc1\\u3002\",\"en\":\"\",\"de\":\"\",\"fr\":\"\",\"vi\":\"\",\"ja\":\"\"}', 'admin', '2015-08-04 13:54:22'); - REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'report','browseReport'), (1,'report','crystalExport'), From 1d2a069f1247b6be84e45f02e834143aeb1aedd7 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 12 Apr 2023 08:44:40 +0800 Subject: [PATCH 2/2] * Rename block. --- module/block/control.php | 8 +++--- module/block/lang/de.php | 12 ++++---- module/block/lang/en.php | 26 ++++++++--------- module/block/lang/fr.php | 28 +++++++++---------- module/block/lang/zh-cn.php | 26 ++++++++--------- ....html.php => doccollectlistblock.html.php} | 0 ...html.php => docmycollectionblock.html.php} | 0 ...html.php => docrecentupdateblock.html.php} | 0 ...ock.html.php => docviewlistblock.html.php} | 0 9 files changed, 50 insertions(+), 50 deletions(-) rename module/block/view/{collectlistblock.html.php => doccollectlistblock.html.php} (100%) rename module/block/view/{mycollectionblock.html.php => docmycollectionblock.html.php} (100%) rename module/block/view/{recentupdateblock.html.php => docrecentupdateblock.html.php} (100%) rename module/block/view/{viewlistblock.html.php => docviewlistblock.html.php} (100%) diff --git a/module/block/control.php b/module/block/control.php index 414bd3dfb2..b141dbae12 100755 --- a/module/block/control.php +++ b/module/block/control.php @@ -2066,7 +2066,7 @@ class block extends control * @access public * @return void */ - public function printMyCollectionBlock() + public function printDocMyCollectionBlock() { } @@ -2076,7 +2076,7 @@ class block extends control * @access public * @return void */ - public function printRecentUpdateBlock() + public function printDocRecentUpdateBlock() { } @@ -2086,7 +2086,7 @@ class block extends control * @access public * @return void */ - public function printViewListBlock() + public function printDocViewListBlock() { } @@ -2096,7 +2096,7 @@ class block extends control * @access public * @return void */ - public function printCollectListBlock() + public function printDocCollectListBlock() { } diff --git a/module/block/lang/de.php b/module/block/lang/de.php index a113c81711..882f320455 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -334,7 +334,7 @@ $lang->block->default['full']['my']['10']['params']['count'] = '15'; /* Doc module block. */ $lang->block->default['doc']['1']['title'] = 'Statistic'; -$lang->block->default['doc']['1']['block'] = 'statistic'; +$lang->block->default['doc']['1']['block'] = 'docstatistic'; $lang->block->default['doc']['1']['grid'] = 8; $lang->block->default['doc']['2']['title'] = 'Dynamic'; @@ -342,15 +342,15 @@ $lang->block->default['doc']['2']['block'] = 'docdynamic'; $lang->block->default['doc']['2']['grid'] = 4; $lang->block->default['doc']['3']['title'] = 'My Collection'; -$lang->block->default['doc']['3']['block'] = 'mycollection'; +$lang->block->default['doc']['3']['block'] = 'docmycollection'; $lang->block->default['doc']['3']['grid'] = 8; -$lang->block->default['doc']['4']['title'] = 'Recently Update'; -$lang->block->default['doc']['4']['block'] = 'recentupdate'; +$lang->block->default['doc']['4']['title'] = 'Recently update'; +$lang->block->default['doc']['4']['block'] = 'docrecentupdate'; $lang->block->default['doc']['4']['grid'] = 8; $lang->block->default['doc']['5']['title'] = 'Browse Leaderboard'; -$lang->block->default['doc']['5']['block'] = 'viewlist'; +$lang->block->default['doc']['5']['block'] = 'docviewlist'; $lang->block->default['doc']['5']['grid'] = 4; if($config->vision == 'rnd') @@ -361,7 +361,7 @@ if($config->vision == 'rnd') } $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard'; -$lang->block->default['doc']['7']['block'] = 'collectlist'; +$lang->block->default['doc']['7']['block'] = 'doccollectlist'; $lang->block->default['doc']['7']['grid'] = 4; $lang->block->default['doc']['8']['title'] = $lang->projectCommon . 'Document'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 0a614422fc..e3988a999a 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -334,7 +334,7 @@ $lang->block->default['full']['my']['10']['params']['count'] = '15'; /* Doc module block. */ $lang->block->default['doc']['1']['title'] = 'Statistic'; -$lang->block->default['doc']['1']['block'] = 'statistic'; +$lang->block->default['doc']['1']['block'] = 'docstatistic'; $lang->block->default['doc']['1']['grid'] = 8; $lang->block->default['doc']['2']['title'] = 'Dynamic'; @@ -342,15 +342,15 @@ $lang->block->default['doc']['2']['block'] = 'docdynamic'; $lang->block->default['doc']['2']['grid'] = 4; $lang->block->default['doc']['3']['title'] = 'My Collection'; -$lang->block->default['doc']['3']['block'] = 'mycollection'; +$lang->block->default['doc']['3']['block'] = 'docmycollection'; $lang->block->default['doc']['3']['grid'] = 8; $lang->block->default['doc']['4']['title'] = 'Recently update'; -$lang->block->default['doc']['4']['block'] = 'recentupdate'; +$lang->block->default['doc']['4']['block'] = 'docrecentupdate'; $lang->block->default['doc']['4']['grid'] = 8; $lang->block->default['doc']['5']['title'] = 'Browse Leaderboard'; -$lang->block->default['doc']['5']['block'] = 'viewlist'; +$lang->block->default['doc']['5']['block'] = 'docviewlist'; $lang->block->default['doc']['5']['grid'] = 4; if($config->vision == 'rnd') @@ -361,7 +361,7 @@ if($config->vision == 'rnd') } $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard'; -$lang->block->default['doc']['7']['block'] = 'collectlist'; +$lang->block->default['doc']['7']['block'] = 'doccollectlist'; $lang->block->default['doc']['7']['grid'] = 4; $lang->block->default['doc']['8']['title'] = $lang->projectCommon . 'Document'; @@ -453,14 +453,14 @@ $lang->block->modules['todo']->availableBlocks->list = 'Todo'; $lang->block->modules['doc'] = new stdclass(); $lang->block->modules['doc']->availableBlocks = new stdclass(); -$lang->block->modules['doc']->availableBlocks->statistic = 'Statistic'; -$lang->block->modules['doc']->availableBlocks->docdynamic = 'Dynamic'; -$lang->block->modules['doc']->availableBlocks->mycollection = 'My Collection'; -$lang->block->modules['doc']->availableBlocks->recentupdate = 'Recently Update'; -$lang->block->modules['doc']->availableBlocks->viewlist = 'Browse Leaderboard'; -$lang->block->modules['doc']->availableBlocks->productdoc = $lang->productCommon . 'Document'; -$lang->block->modules['doc']->availableBlocks->collectlist = 'Favorite Leaderboard'; -$lang->block->modules['doc']->availableBlocks->projectdoc = $lang->projectCommon . 'Document'; +$lang->block->modules['doc']->availableBlocks->docstatistic = 'Statistic'; +$lang->block->modules['doc']->availableBlocks->docdynamic = 'Dynamic'; +$lang->block->modules['doc']->availableBlocks->docmycollection = 'My Collection'; +$lang->block->modules['doc']->availableBlocks->docrecentupdate = 'Recently Update'; +$lang->block->modules['doc']->availableBlocks->docviewlist = 'Browse Leaderboard'; +$lang->block->modules['doc']->availableBlocks->productdoc = $lang->productCommon . 'Document'; +$lang->block->modules['doc']->availableBlocks->doccollectlist = 'Favorite Leaderboard'; +$lang->block->modules['doc']->availableBlocks->projectdoc = $lang->projectCommon . 'Document'; $lang->block->orderByList = new stdclass(); diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 406b27cb53..7e2500eba7 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -334,7 +334,7 @@ $lang->block->default['full']['my']['10']['params']['count'] = '15'; /* Doc module block. */ $lang->block->default['doc']['1']['title'] = 'Statistic'; -$lang->block->default['doc']['1']['block'] = 'statistic'; +$lang->block->default['doc']['1']['block'] = 'docstatistic'; $lang->block->default['doc']['1']['grid'] = 8; $lang->block->default['doc']['2']['title'] = 'Dynamic'; @@ -342,15 +342,15 @@ $lang->block->default['doc']['2']['block'] = 'docdynamic'; $lang->block->default['doc']['2']['grid'] = 4; $lang->block->default['doc']['3']['title'] = 'My Collection'; -$lang->block->default['doc']['3']['block'] = 'mycollection'; +$lang->block->default['doc']['3']['block'] = 'docmycollection'; $lang->block->default['doc']['3']['grid'] = 8; -$lang->block->default['doc']['4']['title'] = 'Recently Update'; -$lang->block->default['doc']['4']['block'] = 'recentupdate'; +$lang->block->default['doc']['4']['title'] = 'Recently update'; +$lang->block->default['doc']['4']['block'] = 'docrecentupdate'; $lang->block->default['doc']['4']['grid'] = 8; $lang->block->default['doc']['5']['title'] = 'Browse Leaderboard'; -$lang->block->default['doc']['5']['block'] = 'viewlist'; +$lang->block->default['doc']['5']['block'] = 'docviewlist'; $lang->block->default['doc']['5']['grid'] = 4; if($config->vision == 'rnd') @@ -361,7 +361,7 @@ if($config->vision == 'rnd') } $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard'; -$lang->block->default['doc']['7']['block'] = 'collectlist'; +$lang->block->default['doc']['7']['block'] = 'doccollectlist'; $lang->block->default['doc']['7']['grid'] = 4; $lang->block->default['doc']['8']['title'] = $lang->projectCommon . 'Document'; @@ -453,14 +453,14 @@ $lang->block->modules['todo']->availableBlocks->list = 'Todo'; $lang->block->modules['doc'] = new stdclass(); $lang->block->modules['doc']->availableBlocks = new stdclass(); -$lang->block->modules['doc']->availableBlocks->statistic = 'Statistic'; -$lang->block->modules['doc']->availableBlocks->docdynamic = 'Dynamic'; -$lang->block->modules['doc']->availableBlocks->mycollection = 'My Collection'; -$lang->block->modules['doc']->availableBlocks->recentupdate = 'Recently Update'; -$lang->block->modules['doc']->availableBlocks->viewlist = 'Browse Leaderboard'; -$lang->block->modules['doc']->availableBlocks->productdoc = $lang->productCommon . 'Document'; -$lang->block->modules['doc']->availableBlocks->collectlist = 'Favorite Leaderboard'; -$lang->block->modules['doc']->availableBlocks->projectdoc = $lang->projectCommon . 'Document'; +$lang->block->modules['doc']->availableBlocks->docstatistic = 'Statistic'; +$lang->block->modules['doc']->availableBlocks->docdynamic = 'Dynamic'; +$lang->block->modules['doc']->availableBlocks->docmycollection = 'My Collection'; +$lang->block->modules['doc']->availableBlocks->docrecentupdate = 'Recently Update'; +$lang->block->modules['doc']->availableBlocks->docviewlist = 'Browse Leaderboard'; +$lang->block->modules['doc']->availableBlocks->productdoc = $lang->productCommon . 'Document'; +$lang->block->modules['doc']->availableBlocks->doccollectlist = 'Favorite Leaderboard'; +$lang->block->modules['doc']->availableBlocks->projectdoc = $lang->projectCommon . 'Document'; $lang->block->orderByList = new stdclass(); diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index ea8a382d39..b48360063b 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -334,7 +334,7 @@ $lang->block->default['full']['my']['10']['params']['count'] = '15'; /* Doc module block. */ $lang->block->default['doc']['1']['title'] = '文档统计'; -$lang->block->default['doc']['1']['block'] = 'statistic'; +$lang->block->default['doc']['1']['block'] = 'docstatistic'; $lang->block->default['doc']['1']['grid'] = 8; $lang->block->default['doc']['2']['title'] = '文档动态'; @@ -342,15 +342,15 @@ $lang->block->default['doc']['2']['block'] = 'docdynamic'; $lang->block->default['doc']['2']['grid'] = 4; $lang->block->default['doc']['3']['title'] = '我的收藏'; -$lang->block->default['doc']['3']['block'] = 'mycollection'; +$lang->block->default['doc']['3']['block'] = 'docmycollection'; $lang->block->default['doc']['3']['grid'] = 8; $lang->block->default['doc']['4']['title'] = '最近更新'; -$lang->block->default['doc']['4']['block'] = 'recentupdate'; +$lang->block->default['doc']['4']['block'] = 'docrecentupdate'; $lang->block->default['doc']['4']['grid'] = 8; $lang->block->default['doc']['5']['title'] = '浏览排行榜'; -$lang->block->default['doc']['5']['block'] = 'viewlist'; +$lang->block->default['doc']['5']['block'] = 'docviewlist'; $lang->block->default['doc']['5']['grid'] = 4; if($config->vision == 'rnd') @@ -361,7 +361,7 @@ if($config->vision == 'rnd') } $lang->block->default['doc']['7']['title'] = '收藏排行榜'; -$lang->block->default['doc']['7']['block'] = 'collectlist'; +$lang->block->default['doc']['7']['block'] = 'doccollectlist'; $lang->block->default['doc']['7']['grid'] = 4; $lang->block->default['doc']['8']['title'] = $lang->projectCommon . '文档'; @@ -453,14 +453,14 @@ $lang->block->modules['todo']->availableBlocks->list = '待办列表'; $lang->block->modules['doc'] = new stdclass(); $lang->block->modules['doc']->availableBlocks = new stdclass(); -$lang->block->modules['doc']->availableBlocks->statistic = '文档统计'; -$lang->block->modules['doc']->availableBlocks->docdynamic = '文档动态'; -$lang->block->modules['doc']->availableBlocks->mycollection = '我的收藏'; -$lang->block->modules['doc']->availableBlocks->recentupdate = '最近更新'; -$lang->block->modules['doc']->availableBlocks->viewlist = '浏览排行榜'; -$lang->block->modules['doc']->availableBlocks->productdoc = $lang->productCommon . '文档'; -$lang->block->modules['doc']->availableBlocks->collectlist = '收藏排行榜'; -$lang->block->modules['doc']->availableBlocks->projectdoc = $lang->projectCommon . '文档'; +$lang->block->modules['doc']->availableBlocks->docstatistic = '文档统计'; +$lang->block->modules['doc']->availableBlocks->docdynamic = '文档动态'; +$lang->block->modules['doc']->availableBlocks->docmycollection = '我的收藏'; +$lang->block->modules['doc']->availableBlocks->docrecentupdate = '最近更新'; +$lang->block->modules['doc']->availableBlocks->docviewlist = '浏览排行榜'; +$lang->block->modules['doc']->availableBlocks->productdoc = $lang->productCommon . '文档'; +$lang->block->modules['doc']->availableBlocks->doccollectlist = '收藏排行榜'; +$lang->block->modules['doc']->availableBlocks->projectdoc = $lang->projectCommon . '文档'; $lang->block->orderByList = new stdclass(); diff --git a/module/block/view/collectlistblock.html.php b/module/block/view/doccollectlistblock.html.php similarity index 100% rename from module/block/view/collectlistblock.html.php rename to module/block/view/doccollectlistblock.html.php diff --git a/module/block/view/mycollectionblock.html.php b/module/block/view/docmycollectionblock.html.php similarity index 100% rename from module/block/view/mycollectionblock.html.php rename to module/block/view/docmycollectionblock.html.php diff --git a/module/block/view/recentupdateblock.html.php b/module/block/view/docrecentupdateblock.html.php similarity index 100% rename from module/block/view/recentupdateblock.html.php rename to module/block/view/docrecentupdateblock.html.php diff --git a/module/block/view/viewlistblock.html.php b/module/block/view/docviewlistblock.html.php similarity index 100% rename from module/block/view/viewlistblock.html.php rename to module/block/view/docviewlistblock.html.php