Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

db/zentao.sql

@@ -1693,6 +1693,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,'program','browse'),
 (1,'program','close'),
 (1,'program','create'),
+(1,'program','kanban'),
 (1,'program','createStakeholder'),
 (1,'program','delete'),
 (1,'program','edit'),
@@ -1818,6 +1819,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,'stakeholder','expect'),
 (1,'stakeholder','expectation'),
 (1,'stakeholder','issue'),
+(1,'stakeholder','plan'),
 (1,'stakeholder','userIssue'),
 (1,'stakeholder','view'),
 (1,'stakeholder','viewExpect'),
@@ -1996,8 +1998,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,'webhook','log'),
 (2,'action','comment'),
 (2,'action','editComment'),
-(2,'action','hideAll'),
-(2,'action','hideOne'),
 (2,'action','trash'),
 (2,'action','undelete'),
 (2,'admin','checkWeak'),
@@ -2039,16 +2039,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'build','unlinkBug'),
 (2,'build','unlinkStory'),
 (2,'build','view'),
-(2,'caselib','batchCreateCase'),
 (2,'caselib','browse'),
-(2,'caselib','create'),
-(2,'caselib','createCase'),
-(2,'caselib','delete'),
-(2,'caselib','edit'),
-(2,'caselib','exportTemplet'),
-(2,'caselib','import'),
 (2,'caselib','index'),
-(2,'caselib','showImport'),
 (2,'caselib','view'),
 (2,'company','browse'),
 (2,'company','dynamic'),
@@ -2086,45 +2078,24 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'doc','showFiles'),
 (2,'doc','tableContents'),
 (2,'doc','view'),
-(2,'execution','activate'),
-(2,'execution','addWhitelist'),
 (2,'execution','all'),
-(2,'execution','batchedit'),
-(2,'execution','batchUnlinkStory'),
 (2,'execution','browse'),
 (2,'execution','bug'),
 (2,'execution','build'),
 (2,'execution','burn'),
 (2,'execution','burnData'),
-(2,'execution','close'),
 (2,'execution','computeBurn'),
-(2,'execution','create'),
-(2,'execution','delete'),
 (2,'execution','doc'),
 (2,'execution','dynamic'),
-(2,'execution','edit'),
 (2,'execution','executionkanban'),
-(2,'execution','export'),
 (2,'execution','fixFirst'),
 (2,'execution','grouptask'),
-(2,'execution','importBug'),
-(2,'execution','importplanstories'),
-(2,'execution','importtask'),
-(2,'execution','index'),
 (2,'execution','kanban'),
-(2,'execution','kanbanColsColor'),
-(2,'execution','kanbanHideCols'),
-(2,'execution','linkStory'),
 (2,'execution','manageMembers'),
-(2,'execution','manageProducts'),
 (2,'execution','printKanban'),
-(2,'execution','putoff'),
-(2,'execution','start'),
 (2,'execution','story'),
 (2,'execution','storyEstimate'),
 (2,'execution','storyKanban'),
-(2,'execution','storySort'),
-(2,'execution','suspend'),
 (2,'execution','task'),
 (2,'execution','team'),
 (2,'execution','testcase'),
@@ -2133,10 +2104,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'execution','tree'),
 (2,'execution','treeStory'),
 (2,'execution','treeTask'),
-(2,'execution','unbindWhitelist'),
-(2,'execution','unlinkMember'),
-(2,'execution','unlinkStory'),
-(2,'execution','updateOrder'),
 (2,'execution','view'),
 (2,'execution','whitelist'),
 (2,'file','delete'),
@@ -2149,17 +2116,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'git','diff'),
 (2,'group','browse'),
 (2,'index','index'),
-(2,'mail','batchDelete'),
-(2,'mail','browse'),
-(2,'mail','delete'),
-(2,'mail','detect'),
-(2,'mail','edit'),
-(2,'mail','index'),
-(2,'mail','resend'),
-(2,'mail','reset'),
-(2,'mail','save'),
-(2,'mail','sendcloudUser'),
-(2,'mail','test'),
 (2,'message','browser'),
 (2,'message','index'),
 (2,'message','setting'),
@@ -2185,7 +2141,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'my','testcase'),
 (2,'my','testtask'),
 (2,'my','todo'),
-(2,'my','unbind'),
 (2,'my','uploadAvatar'),
 (2,'my','work'),
 (2,'personnel','accessible'),
@@ -2195,7 +2150,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'product','browse'),
 (2,'product','build'),
 (2,'product','dashboard'),
-(2,'product','doc'),
 (2,'product','dynamic'),
 (2,'product','index'),
 (2,'product','kanban'),
@@ -2203,60 +2157,40 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'product','roadmap'),
 (2,'product','view'),
 (2,'product','whitelist'),
-(2,'productplan','batchEdit'),
-(2,'productplan','batchUnlinkBug'),
-(2,'productplan','batchUnlinkStory'),
 (2,'productplan','browse'),
-(2,'productplan','create'),
-(2,'productplan','delete'),
-(2,'productplan','edit'),
-(2,'productplan','linkBug'),
-(2,'productplan','linkStory'),
-(2,'productplan','unlinkBug'),
-(2,'productplan','unlinkStory'),
 (2,'productplan','view'),
 (2,'program','browse'),
+(2,'program','kanban'),
 (2,'program','product'),
 (2,'program','project'),
 (2,'program','stakeholder'),
 (2,'program','view'),
-(2,'project','activate'),
-(2,'project','addWhitelist'),
 (2,'project','browse'),
-(2,'project','close'),
-(2,'project','copyGroup'),
+(2,'project','bug'),
+(2,'project','build'),
 (2,'project','create'),
-(2,'project','createGroup'),
+(2,'project','dynamic'),
 (2,'project','edit'),
-(2,'project','editGroup'),
-(2,'project','group'),
+(2,'project','execution'),
 (2,'project','index'),
 (2,'project','kanban'),
-(2,'project','manageGroupMember'),
 (2,'project','manageMembers'),
-(2,'project','managePriv'),
-(2,'project','manageProducts'),
 (2,'project','programTitle'),
-(2,'project','start'),
-(2,'project','suspend'),
+(2,'project','qa'),
+(2,'project','team'),
+(2,'project','testcase'),
+(2,'project','testreport'),
+(2,'project','testtask'),
 (2,'project','view'),
 (2,'project','whitelist'),
+(2,'projectbuild','browse'),
+(2,'projectrelease','browse'),
+(2,'projectrelease','view'),
 (2,'projectstory','story'),
 (2,'projectstory','track'),
 (2,'projectstory','view'),
 (2,'qa','index'),
-(2,'release','batchUnlinkBug'),
-(2,'release','batchUnlinkStory'),
 (2,'release','browse'),
-(2,'release','changeStatus'),
-(2,'release','create'),
-(2,'release','delete'),
-(2,'release','edit'),
-(2,'release','export'),
-(2,'release','linkBug'),
-(2,'release','linkStory'),
-(2,'release','unlinkBug'),
-(2,'release','unlinkStory'),
 (2,'release','view'),
 (2,'repo','blame'),
 (2,'repo','browse'),
@@ -2282,35 +2216,12 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'search','index'),
 (2,'search','saveQuery'),
 (2,'search','select'),
-(2,'story','activate'),
-(2,'story','assignTo'),
-(2,'story','batchAssignTo'),
-(2,'story','batchChangeBranch'),
-(2,'story','batchChangeModule'),
-(2,'story','batchChangePlan'),
-(2,'story','batchChangeStage'),
-(2,'story','batchClose'),
-(2,'story','batchCreate'),
-(2,'story','batchEdit'),
-(2,'story','batchReview'),
-(2,'story','batchToTask'),
 (2,'story','bugs'),
 (2,'story','cases'),
-(2,'story','change'),
-(2,'story','close'),
-(2,'story','create'),
-(2,'story','delete'),
-(2,'story','edit'),
-(2,'story','export'),
-(2,'story','linkStory'),
-(2,'story','processStoryChange'),
-(2,'story','recall'),
 (2,'story','report'),
-(2,'story','review'),
 (2,'story','tasks'),
 (2,'story','track'),
 (2,'story','view'),
-(2,'story','zeroCase'),
 (2,'svn','apiSync'),
 (2,'svn','cat'),
 (2,'svn','diff'),
@@ -2338,46 +2249,19 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'task','restart'),
 (2,'task','start'),
 (2,'task','view'),
-(2,'testcase','batchCaseTypeChange'),
-(2,'testcase','batchChangeBranch'),
-(2,'testcase','batchChangeModule'),
-(2,'testcase','batchConfirmStoryChange'),
-(2,'testcase','batchCreate'),
-(2,'testcase','batchDelete'),
-(2,'testcase','batchEdit'),
-(2,'testcase','batchReview'),
 (2,'testcase','browse'),
 (2,'testcase','bugs'),
-(2,'testcase','confirmChange'),
-(2,'testcase','confirmLibcaseChange'),
-(2,'testcase','confirmStoryChange'),
-(2,'testcase','create'),
 (2,'testcase','createBug'),
-(2,'testcase','delete'),
-(2,'testcase','edit'),
 (2,'testcase','export'),
-(2,'testcase','exportTemplet'),
 (2,'testcase','groupCase'),
-(2,'testcase','ignoreLibcaseChange'),
-(2,'testcase','import'),
-(2,'testcase','importFromLib'),
-(2,'testcase','linkCases'),
-(2,'testcase','review'),
-(2,'testcase','showImport'),
 (2,'testcase','view'),
 (2,'testreport','browse'),
 (2,'testreport','create'),
 (2,'testreport','delete'),
 (2,'testreport','edit'),
 (2,'testreport','view'),
-(2,'testsuite','batchUnlinkCases'),
 (2,'testsuite','browse'),
-(2,'testsuite','create'),
-(2,'testsuite','delete'),
-(2,'testsuite','edit'),
 (2,'testsuite','index'),
-(2,'testsuite','linkCase'),
-(2,'testsuite','unlinkCase'),
 (2,'testsuite','view'),
 (2,'testtask','activate'),
 (2,'testtask','batchAssign'),
@@ -2441,6 +2325,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'user','view'),
 (3,'action','comment'),
 (3,'action','editComment'),
+(3,'admin','index'),
+(3,'automation','browse'),
 (3,'bug','activate'),
 (3,'bug','assignTo'),
 (3,'bug','batchActivate'),
@@ -2754,6 +2640,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4,'action','trash'),
 (4,'action','undelete'),
 (4,'admin','index'),
+(4,'admin','checkWeak'),
+(4,'admin','safe'),
 (4,'automation','browse'),
 (4,'bug','activate'),
 (4,'bug','assignTo'),
@@ -3019,8 +2907,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4,'project','updateOrder'),
 (4,'project','view'),
 (4,'project','whitelist'),
-(4,'project','unbindWhielist'),
-(4,'project','unlinkStakeholder'),
 (4,'projectbuild','browse'),
 (4,'projectrelease','batchUnlinkBug'),
 (4,'projectrelease','batchUnlinkStory'),
@@ -3093,6 +2979,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4,'stakeholder','expect'),
 (4,'stakeholder','expectation'),
 (4,'stakeholder','issue'),
+(4,'stakeholder','plan'),
 (4,'stakeholder','userIssue'),
 (4,'stakeholder','view'),
 (4,'stakeholder','viewExpect'),
@@ -3262,6 +3149,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'action','trash'),
 (5,'action','undelete'),
 (5,'admin','index'),
+(5,'admin','checkWeak'),
+(5,'admin','safe'),
 (5,'automation','browse'),
 (5,'branch','delete'),
 (5,'branch','manage'),
@@ -3381,6 +3270,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'file','delete'),
 (5,'file','download'),
 (5,'file','edit'),
+(5,'file','setPublic'),
 (5,'file','uploadImages'),
 (5,'git','apiSync'),
 (5,'git','cat'),
@@ -3491,7 +3381,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'project','copyGroup'),
 (5,'project','create'),
 (5,'project','createGroup'),
-(5,'project','createStakeholder'),
 (5,'project','createGuide'),
 (5,'project','delete'),
 (5,'project','dynamic'),
@@ -3506,7 +3395,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'project','manageMembers'),
 (5,'project','managePriv'),
 (5,'project','manageProducts'),
-(5,'project','manageView'),
 (5,'project','programTitle'),
 (5,'project','qa'),
 (5,'project','start'),
@@ -3516,11 +3404,24 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'project','testreport'),
 (5,'project','testtask'),
 (5,'project','unbindWhitelist'),
-(5,'project','unlinkStakeholder'),
 (5,'project','unlinkMember'),
 (5,'project','updateOrder'),
 (5,'project','view'),
 (5,'project','whitelist'),
+(5,'projectbuild','browse'),
+(5,'projectrelease','batchUnlinkBug'),
+(5,'projectrelease','batchUnlinkStory'),
+(5,'projectrelease','browse'),
+(5,'projectrelease','changeStatus'),
+(5,'projectrelease','create'),
+(5,'projectrelease','delete'),
+(5,'projectrelease','edit'),
+(5,'projectrelease','export'),
+(5,'projectrelease','linkBug'),
+(5,'projectrelease','linkStory'),
+(5,'projectrelease','unlinkBug'),
+(5,'projectrelease','unlinkStory'),
+(5,'projectrelease','view'),
 (5,'projectstory','batchUnlinkStory'),
 (5,'projectstory','importplanstories'),
 (5,'projectstory','linkStory'),
@@ -3568,6 +3469,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'search','saveQuery'),
 (5,'search','select'),
 (5,'stakeholder','browse'),
+(5,'stakeholder','batchCreate'),
 (5,'stakeholder','communicate'),
 (5,'stakeholder','create'),
 (5,'stakeholder','createExpect'),
@@ -3578,6 +3480,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'stakeholder','expect'),
 (5,'stakeholder','expectation'),
 (5,'stakeholder','issue'),
+(5,'stakeholder','plan'),
 (5,'stakeholder','userIssue'),
 (5,'stakeholder','view'),
 (5,'stakeholder','viewExpect'),
@@ -3891,7 +3794,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6,'project','close'),
 (6,'project','copyGroup'),
 (6,'project','create'),
-(6,'project','createStakeholder'),
 (6,'project','createGroup'),
 (6,'project','createGuide'),
 (6,'project','delete'),
@@ -3907,7 +3809,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6,'project','manageMembers'),
 (6,'project','managePriv'),
 (6,'project','manageProducts'),
-(6,'project','manageView'),
 (6,'project','programTitle'),
 (6,'project','qa'),
 (6,'project','start'),
@@ -3917,7 +3818,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6,'project','testreport'),
 (6,'project','testtask'),
 (6,'project','unbindWhitelist'),
-(6,'project','unlinkStakeholder'),
 (6,'project','unlinkMember'),
 (6,'project','updateOrder'),
 (6,'project','view'),
@@ -4097,6 +3997,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'action','trash'),
 (7,'action','undelete'),
 (7,'admin','index'),
+(7,'admin','checkWeak'),
+(7,'admin','safe'),
 (7,'automation','browse'),
 (7,'branch','delete'),
 (7,'branch','manage'),
@@ -4125,6 +4027,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'bug','report'),
 (7,'bug','resolve'),
 (7,'bug','view'),
+(7,'build','create'),
+(7,'build','delete'),
+(7,'build','edit'),
 (7,'build','view'),
 (7,'company','browse'),
 (7,'company','dynamic'),
@@ -4159,10 +4064,14 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'execution','linkStory'),
 (7,'execution','manageProducts'),
 (7,'execution','story'),
+(7,'execution','storyKanban'),
+(7,'execution','storySort'),
 (7,'execution','task'),
 (7,'execution','team'),
 (7,'execution','testtask'),
 (7,'execution','tree'),
+(7,'execution','treeStory'),
+(7,'execution','treeTask'),
 (7,'execution','unlinkStory'),
 (7,'execution','view'),
 (7,'extension','browse'),
@@ -4260,20 +4169,25 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'program','suspend'),
 (7,'program','unbindWhitelist'),
 (7,'program','unlinkStakeholder'),
+(7,'program','updateOrder'),
 (7,'program','view'),
 (7,'project','activate'),
 (7,'project','addWhitelist'),
 (7,'project','batchEdit'),
 (7,'project','browse'),
+(7,'project','bug'),
+(7,'project','build'),
 (7,'project','close'),
 (7,'project','copyGroup'),
 (7,'project','create'),
 (7,'project','createGroup'),
 (7,'project','createGuide'),
-(7,'project','createStakeholder'),
 (7,'project','delete'),
+(7,'project','dynamic'),
 (7,'project','edit'),
 (7,'project','editGroup'),
+(7,'project','execution'),
+(7,'project','export'),
 (7,'project','group'),
 (7,'project','index'),
 (7,'project','kanban'),
@@ -4281,16 +4195,19 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'project','manageMembers'),
 (7,'project','managePriv'),
 (7,'project','manageProducts'),
-(7,'project','manageView'),
 (7,'project','programTitle'),
+(7,'project','qa'),
 (7,'project','start'),
 (7,'project','suspend'),
 (7,'project','team'),
+(7,'project','testcase'),
+(7,'project','testreport'),
+(7,'project','testtask'),
 (7,'project','unbindWhitelist'),
-(7,'project','unlinkStakeholder'),
 (7,'project','updateOrder'),
 (7,'project','view'),
 (7,'project','whitelist'),
+(7,'projectbuild','browse'),
 (7,'projectrelease','browse'),
 (7,'projectrelease','export'),
 (7,'projectrelease','view'),
@@ -4379,12 +4296,27 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'svn','apiSync'),
 (7,'svn','cat'),
 (7,'svn','diff'),
+(7,'task','activate'),
+(7,'task','assignTo'),
+(7,'task','batchAssignTo'),
+(7,'task','batchChangeModule'),
+(7,'task','batchClose'),
+(7,'task','batchCreate'),
+(7,'task','batchEdit'),
+(7,'task','cancel'),
+(7,'task','close'),
+(7,'task','create'),
 (7,'task','confirmStoryChange'),
 (7,'task','deleteEstimate'),
+(7,'task','edit'),
 (7,'task','editEstimate'),
 (7,'task','export'),
+(7,'task','finish'),
+(7,'task','pause'),
 (7,'task','recordEstimate'),
 (7,'task','report'),
+(7,'task','restart'),
+(7,'task','start'),
 (7,'task','view'),
 (7,'testcase','browse'),
 (7,'testcase','bugs'),
@@ -4394,11 +4326,16 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'testcase','importFromLib'),
 (7,'testcase','index'),
 (7,'testcase','view'),
+(7,'testreport','browse'),
+(7,'testreport','export'),
+(7,'testreport','view'),
 (7,'testsuite','browse'),
 (7,'testsuite','index'),
 (7,'testsuite','view'),
 (7,'testtask','browse'),
 (7,'testtask','cases'),
+(7,'testtask','create'),
+(7,'testtask','edit'),
 (7,'testtask','groupCase'),
 (7,'testtask','index'),
 (7,'testtask','results'),
@@ -4447,6 +4384,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,'action','trash'),
 (8,'action','undelete'),
 (8,'admin','index'),
+(8,'admin','checkWeak'),
+(8,'admin','safe'),
 (8,'automation','browse'),
 (8,'bug','activate'),
 (8,'bug','assignTo'),
@@ -4495,6 +4434,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,'company','view'),
 (8,'compile','browse'),
 (8,'compile','logs'),
+(8,'custom','index'),
 (8,'datatable','setGlobal'),
 (8,'doc','allLibs'),
 (8,'doc','browse'),
@@ -4633,7 +4573,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,'project','create'),
 (8,'project','createGroup'),
 (8,'project','createGuide'),
-(8,'project','createStakeholder'),
 (8,'project','delete'),
 (8,'project','dynamic'),
 (8,'project','edit'),
@@ -4647,7 +4586,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,'project','manageMembers'),
 (8,'project','managePriv'),
 (8,'project','manageProducts'),
-(8,'project','manageView'),
 (8,'project','programTitle'),
 (8,'project','qa'),
 (8,'project','start'),
@@ -4657,10 +4595,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,'project','testreport'),
 (8,'project','testtask'),
 (8,'project','unbindWhitelist'),
-(8,'project','unlinkStakeholder'),
 (8,'project','updateOrder'),
 (8,'project','view'),
 (8,'project','whitelist'),
+(8,'projectbuild','browse'),
+(8,'projectrelease','browse'),
 (8,'projectstory','story'),
 (8,'projectstory','track'),
 (8,'projectstory','view'),
@@ -4757,6 +4696,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,'testreport','delete'),
 (8,'testreport','edit'),
 (8,'testreport','view'),
+(8,'testsuite','batchUnlinkCases'),
 (8,'testsuite','browse'),
 (8,'testsuite','create'),
 (8,'testsuite','delete'),
@@ -4865,6 +4805,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,'company','edit'),
 (9,'company','index'),
 (9,'company','view'),
+(9,'custom','index'),
+(9,'custom','restore'),
+(9,'custom','setPublic'),
 (9,'datatable','setGlobal'),
 (9,'dept','browse'),
 (9,'dept','delete'),
@@ -4996,7 +4939,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,'project','create'),
 (9,'project','createGroup'),
 (9,'project','createGuide'),
-(9,'project','createStakeholder'),
 (9,'project','delete'),
 (9,'project','dynamic'),
 (9,'project','edit'),
@@ -5010,7 +4952,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,'project','manageMembers'),
 (9,'project','managePriv'),
 (9,'project','manageProducts'),
-(9,'project','manageView'),
 (9,'project','programTitle'),
 (9,'project','qa'),
 (9,'project','start'),
@@ -5020,11 +4961,13 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,'project','testreport'),
 (9,'project','testtask'),
 (9,'project','unbindWhitelist'),
-(9,'project','unlinkStakeholder'),
 (9,'project','unlinkMember'),
 (9,'project','updateOrder'),
 (9,'project','view'),
 (9,'project','whitelist'),
+(9,'projectbuild','browse'),
+(9,'projectrelease','browse'),
+(9,'projectrelease','view'),
 (9,'projectstory','story'),
 (9,'projectstory','track'),
 (9,'projectstory','view'),
@@ -5052,6 +4995,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,'search','index'),
 (9,'search','saveQuery'),
 (9,'search','select'),
+(9,'stakeholder','batchCreate'),
 (9,'stakeholder','browse'),
 (9,'stakeholder','communicate'),
 (9,'stakeholder','create'),
@@ -5063,6 +5007,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,'stakeholder','expect'),
 (9,'stakeholder','expectation'),
 (9,'stakeholder','issue'),
+(9,'stakeholder','plan'),
 (9,'stakeholder','userIssue'),
 (9,'stakeholder','view'),
 (9,'stakeholder','viewExpect'),
@@ -5195,6 +5140,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10,'company','view'),
 (10,'doc','allLibs'),
 (10,'doc','browse'),
+(10,'doc','collect'),
 (10,'doc','create'),
 (10,'doc','edit'),
 (10,'doc','index'),
@@ -5234,20 +5180,28 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10,'my','changePassword'),
 (10,'my','contribute'),
 (10,'my','deleteContacts'),
+(10,'my','doc'),
 (10,'my','dynamic'),
 (10,'my','editProfile'),
+(10,'my','execution'),
 (10,'my','index'),
 (10,'my','manageContacts'),
 (10,'my','preference'),
 (10,'my','profile'),
 (10,'my','project'),
+(10,'my','score'),
 (10,'my','story'),
 (10,'my','task'),
 (10,'my','team'),
+(10,'my','testcase'),
+(10,'my','testtask'),
 (10,'my','todo'),
 (10,'my','unbind'),
 (10,'my','uploadAvatar'),
 (10,'my','work'),
+(10,'personnel','accessible'),
+(10,'personnel','invest'),
+(10,'personnel','whitelist'),
 (10,'product','all'),
 (10,'product','browse'),
 (10,'product','build'),
@@ -5261,8 +5215,23 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10,'productplan','browse'),
 (10,'productplan','view'),
 (10,'program','browse'),
+(10,'program','kanban'),
+(10,'program','product'),
+(10,'program','project'),
+(10,'program','stakeholder'),
+(10,'program','view'),
 (10,'project','browse'),
+(10,'project','bug'),
+(10,'project','build'),
 (10,'project','index'),
+(10,'project','dynamic'),
+(10,'project','kanban'),
+(10,'project','team'),
+(10,'project','testtask'),
+(10,'project','view'),
+(10,'projectbuild','browse'),
+(10,'projectrelease','browse'),
+(10,'projectrelease','view'),
 (10,'projectstory','story'),
 (10,'projectstory','track'),
 (10,'projectstory','view'),
@@ -5290,6 +5259,10 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10,'search','index'),
 (10,'search','saveQuery'),
 (10,'search','select'),
+(10,'stakeholder','browse'),
+(10,'stakeholder','userIssue'),
+(10,'stakeholder','view'),
+(10,'stakeholder','viewIssue'),
 (10,'story','bugs'),
 (10,'story','cases'),
 (10,'story','export'),
@@ -5328,6 +5301,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10,'testcase','export'),
 (10,'testcase','groupCase'),
 (10,'testcase','view'),
+(10,'testreport','browse'),
+(10,'testreport','view'),
 (10,'testsuite','browse'),
 (10,'testsuite','index'),
 (10,'testsuite','view'),
@@ -5351,6 +5326,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10,'todo','export'),
 (10,'todo','finish'),
 (10,'todo','import2Today'),
+(10,'todo','start'),
 (10,'todo','view'),
 (10,'user','bug'),
 (10,'user','cropAvatar'),
@@ -5391,6 +5367,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (11,'bug','report'),
 (11,'bug','resolve'),
 (11,'bug','view'),
+(11,'build','create'),
+(11,'build','delete'),
+(11,'build','edit'),
 (11,'build','view'),
 (11,'company','browse'),
 (11,'company','dynamic'),

module/bug/css/batchcreate.css

@@ -1,6 +1,6 @@
 .c-id {width: 50px !important;}
 .c-branch, .c-module, .c-os {width: 120px;}
 .c-execution {width: 130px;}
-.c-build, .c-browser, .c-keywords, .c-other {width: 100px;}
+.c-build, .c-browser, .c-keywords {width: 100px;}
 .c-steps {width: 150px;}
 .c-pri, .c-severity {width: 80px;}

module/bug/css/batchedit.css

@@ -4,6 +4,6 @@
 .c-id {width: 50px !important;}
 .c-branch, .c-module, .c-os {width: 120px;}
 .c-execution {width: 130px;}
-.c-build, .c-browser, .c-keywords, .c-other {width: 100px;}
+.c-build, .c-browser, .c-keywords {width: 100px;}
 .c-steps, .c-title, .c-plan, .c-assigned, .c-resolution {width: 150px;}
 .c-pri, .c-severity {width: 80px;}

module/bug/view/batchcreate.html.php

@@ -62,7 +62,7 @@
             <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
             <?php
             $extendFields = $this->bug->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-extend'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>

module/bug/view/batchedit.html.php

@@ -66,7 +66,7 @@
             <th class='c-resolution<?php echo zget($visibleFields, 'resolution', ' hidden')?>'><?php echo $lang->bug->resolutionAB;?></th>
             <?php
             $extendFields = $this->bug->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-extend'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>

module/common/view/kanban.html.php

@@ -197,7 +197,6 @@ function renderExecutionItem(item, $item)
             $item.addClass('link-block');
             $title = $('<a class="title" />')
                 .attr('href', $.createLink('execution', 'task', 'executionID=' + item._id));
-            console.log($title);
         }
         else
         {

module/dept/model.php

@@ -407,7 +407,7 @@ class deptModel extends model
         return $this->dao->select("$keyField, realname")->from(TABLE_USER)
             ->where('deleted')->eq(0)
             ->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq($type)->fi()
-            ->beginIF($deptID)->andWhere('dept')->in($childDepts)->fi()
+            ->beginIF($childDepts)->andWhere('dept')->in($childDepts)->fi()
             ->orderBy('account')
             ->fetchPairs();
     }

module/story/view/batchcreate.html.php

@@ -61,7 +61,7 @@
             <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->story->keywords;?></th>
             <?php
             $extendFields = $this->story->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-extend'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>

module/story/view/batchedit.html.php

@@ -61,7 +61,7 @@ foreach(explode(',', $showFields) as $field)
           <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden')?>'><?php echo $lang->story->keywords;?></th>
           <?php
           $extendFields = $this->story->getFlowExtendFields();
-          foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
+          foreach($extendFields as $extendField) echo "<th class='c-extend'>{$extendField->name}</th>";
           ?>
         </tr>
       </thead>

module/task/view/batchedit.html.php

@@ -71,7 +71,7 @@ js::set('dittoNotice', $dittoNotice);
             <th class='c-reason<?php echo zget($visibleFields,    'closedReason', ' hidden') . zget($requiredFields, 'closedReason', '', ' required');?>'><?php echo $lang->task->closedReason;?></th>
             <?php
             $extendFields = $this->task->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-extend'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>

module/testcase/view/batchcreate.html.php

@@ -66,7 +66,7 @@
             <th class='c-review<?php  echo zget($visibleFields, 'review', ' hidden') . zget($requiredFields, 'review', '', ' required')?>'><?php echo $lang->testcase->review;?></th>
             <?php
             $extendFields = $this->testcase->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-extend'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>

module/testcase/view/batchedit.html.php

@@ -59,7 +59,7 @@
             <th class='c-stage<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required');?>'><?php echo $lang->testcase->stage;?></th>
             <?php
             $extendFields = $this->testcase->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-extend'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>

module/testcase/view/showimport.html.php

@@ -41,7 +41,7 @@ $(function()
           <th><?php echo $lang->testcase->precondition?></th>
           <?php if(!empty($appendFields)):?>
           <?php foreach($appendFields as $appendField):?>
-          <th class='c-other'><?php echo $lang->testcase->{$appendField->field}?></th>
+          <th class='c-extend'><?php echo $lang->testcase->{$appendField->field}?></th>
           <?php endforeach;?>
           <?php endif;?>
           <th class='c-step'>

module/todo/control.php

@@ -385,9 +385,10 @@ class todo extends control
         }
 
         /* Fix bug #936. */
-        if($this->app->user->account != $todo->account and !common::hasPriv('company', 'index'))
+        $account = $this->app->user->account;
+        if($account != $todo->account and $account != $todo->assignedTo and !common::hasPriv('my', 'team'))
         {
-            $this->locate($this->createLink('user', 'deny', "module=company&method=index"));
+            $this->locate($this->createLink('user', 'deny', "module=my&method=team"));
         }
 
         $this->loadModel('user');

www/theme/default/style.css

@@ -57,7 +57,7 @@ a.showMoreImage:hover {opacity: 1;}
 .c-estimate {width: 70px;}
 .c-number, .c-stage, .c-role, .c-estimate-box, .c-result {width: 80px;}
 .c-company, .c-budget {width: 80px;}
-.c-status, .c-type, .c-user, .c-date, .c-encode, .c-resolution, .c-pri-box, .c-other {width: 100px;}
+.c-status, .c-type, .c-user, .c-date, .c-encode, .c-resolution, .c-pri-box, .c-extend {width: 100px;}
 .c-object-type {width: 130px;}
 .c-full-date, .c-mobile, .c-email, .c-text, .c-subject, .c-assigned-box, .c-user-box {width: 150px;}
 .c-module, .c-date-box {width: 180px;}