From 4488de2725e23fcd30deba1a2ac187fdd5eb889e Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Fri, 2 Apr 2021 15:26:08 +0800
Subject: [PATCH]  * adjust for priv.

---
 db/zentao.sql            | 907 ++++++++++++++++++++-------------------
 module/upgrade/model.php |  29 +-
 2 files changed, 492 insertions(+), 444 deletions(-)

diff --git a/db/zentao.sql b/db/zentao.sql
index 3ca79c4803..7ebfa9fa64 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1476,6 +1476,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,'message','setting'),
 (1,'misc','ping'),
 (1,'my','calendar'),
+(1,'my','team'),
+(1,'my','work'),
+(1,'my','contribute'),
 (1,'my','changePassword'),
 (1,'my','deleteContacts'),
 (1,'my','dynamic'),
@@ -1515,79 +1518,80 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,'productplan','unlinkBug'),
 (1,'productplan','unlinkStory'),
 (1,'productplan','view'),
-(1,'program','createGuide'),
-(1,'program','createStakeholder'),
 (1,'program','index'),
-(1,'program','PGMActivate'),
-(1,'program','PGMBrowse'),
-(1,'program','PGMClose'),
-(1,'program','PGMCreate'),
-(1,'program','PGMDelete'),
-(1,'program','PGMEdit'),
-(1,'program','PGMProduct'),
-(1,'program','PGMProject'),
-(1,'program','PGMStakeholder'),
-(1,'program','PGMStart'),
-(1,'program','PGMSuspend'),
 (1,'program','activate'),
-(1,'program','addWhitelist'),
 (1,'program','browse'),
 (1,'program','close'),
-(1,'program','copyGroup'),
 (1,'program','create'),
-(1,'program','createGroup'),
 (1,'program','delete'),
 (1,'program','edit'),
-(1,'program','editGroup'),
-(1,'program','group'),
-(1,'program','manageGroupMember'),
-(1,'program','manageMembers'),
-(1,'program','managePriv'),
-(1,'program','manageProducts'),
-(1,'program','manageView'),
-(1,'program','programTitle'),
+(1,'program','product'),
+(1,'program','project'),
+(1,'program','stakeholder'),
 (1,'program','start'),
 (1,'program','suspend'),
-(1,'program','view'),
-(1,'program','updateOrder'),
-(1,'program','whitelist'),
-(1,'program','unbindWhielist'),
-(1,'program','unlinkStakeholder'),
-(1,'project','activate'),
-(1,'project','all'),
-(1,'project','batchedit'),
-(1,'project','batchUnlinkStory'),
-(1,'project','browse'),
-(1,'project','bug'),
-(1,'project','build'),
-(1,'project','burn'),
-(1,'project','close'),
-(1,'project','computeBurn'),
-(1,'project','create'),
-(1,'project','delete'),
-(1,'project','doc'),
-(1,'project','dynamic'),
-(1,'project','edit'),
-(1,'project','grouptask'),
-(1,'project','importBug'),
-(1,'project','importtask'),
+(1,'project','createGuide'),
+(1,'project','createStakeholder'),
 (1,'project','index'),
-(1,'project','kanban'),
-(1,'project','linkStory'),
+(1,'project','activate'),
+(1,'project','addWhitelist'),
+(1,'project','browse'),
+(1,'project','close'),
+(1,'project','copyGroup'),
+(1,'project','create'),
+(1,'project','createGroup'),
+(1,'project','delete'),
+(1,'project','edit'),
+(1,'project','editGroup'),
+(1,'project','group'),
+(1,'project','manageGroupMember'),
 (1,'project','manageMembers'),
+(1,'project','managePriv'),
 (1,'project','manageProducts'),
-(1,'project','putoff'),
+(1,'project','manageView'),
+(1,'project','programTitle'),
 (1,'project','start'),
-(1,'project','story'),
 (1,'project','suspend'),
-(1,'project','task'),
-(1,'project','team'),
-(1,'project','testtask'),
-(1,'project','tree'),
-(1,'project','unlinkMember'),
-(1,'project','unlinkStory'),
-(1,'project','updateOrder'),
 (1,'project','view'),
+(1,'project','updateOrder'),
+(1,'project','whitelist'),
+(1,'project','unbindWhielist'),
+(1,'project','unlinkStakeholder'),
+(1,'execution','activate'),
+(1,'execution','all'),
+(1,'execution','batchedit'),
+(1,'execution','batchUnlinkStory'),
+(1,'execution','browse'),
+(1,'execution','bug'),
+(1,'execution','build'),
+(1,'execution','burn'),
+(1,'execution','close'),
+(1,'execution','computeBurn'),
+(1,'execution','create'),
+(1,'execution','delete'),
+(1,'execution','doc'),
+(1,'execution','dynamic'),
+(1,'execution','edit'),
+(1,'execution','grouptask'),
+(1,'execution','importBug'),
+(1,'execution','importtask'),
+(1,'execution','index'),
+(1,'execution','kanban'),
+(1,'execution','linkStory'),
+(1,'execution','manageMembers'),
+(1,'execution','manageProducts'),
+(1,'execution','putoff'),
+(1,'execution','start'),
+(1,'execution','story'),
+(1,'execution','suspend'),
+(1,'execution','task'),
+(1,'execution','team'),
+(1,'execution','testtask'),
+(1,'execution','tree'),
+(1,'execution','unlinkMember'),
+(1,'execution','unlinkStory'),
+(1,'execution','updateOrder'),
+(1,'execution','view'),
 (1,'projectbuild','browse'),
 (1,'projectrelease','batchUnlinkBug'),
 (1,'projectrelease','batchUnlinkStory'),
@@ -1845,6 +1849,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'index','index'),
 (2,'misc','ping'),
 (2,'my','calendar'),
+(2,'my','team'),
+(2,'my','work'),
+(2,'my','contribute'),
 (2,'my','changePassword'),
 (2,'my','deleteContacts'),
 (2,'my','dynamic'),
@@ -1869,25 +1876,25 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,'product','view'),
 (2,'productplan','browse'),
 (2,'productplan','view'),
-(2,'project','all'),
-(2,'project','browse'),
-(2,'project','bug'),
-(2,'project','build'),
-(2,'project','burn'),
-(2,'project','computeBurn'),
-(2,'project','doc'),
-(2,'project','dynamic'),
-(2,'project','grouptask'),
-(2,'project','importBug'),
-(2,'project','importtask'),
-(2,'project','index'),
-(2,'project','kanban'),
-(2,'project','story'),
-(2,'project','task'),
-(2,'project','team'),
-(2,'project','testtask'),
-(2,'project','tree'),
-(2,'project','view'),
+(2,'execution','all'),
+(2,'execution','browse'),
+(2,'execution','bug'),
+(2,'execution','build'),
+(2,'execution','burn'),
+(2,'execution','computeBurn'),
+(2,'execution','doc'),
+(2,'execution','dynamic'),
+(2,'execution','grouptask'),
+(2,'execution','importBug'),
+(2,'execution','importtask'),
+(2,'execution','index'),
+(2,'execution','kanban'),
+(2,'execution','story'),
+(2,'execution','task'),
+(2,'execution','team'),
+(2,'execution','testtask'),
+(2,'execution','tree'),
+(2,'execution','view'),
 (2,'projectstory','story'),
 (2,'projectstory','track'),
 (2,'projectstory','view'),
@@ -2037,6 +2044,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (3,'index','index'),
 (3,'misc','ping'),
 (3,'my','calendar'),
+(3,'my','team'),
+(3,'my','work'),
+(3,'my','contribute'),
 (3,'my','changePassword'),
 (3,'my','deleteContacts'),
 (3,'my','dynamic'),
@@ -2061,25 +2071,25 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (3,'product','view'),
 (3,'productplan','browse'),
 (3,'productplan','view'),
-(3,'project','all'),
-(3,'project','browse'),
-(3,'project','bug'),
-(3,'project','build'),
-(3,'project','burn'),
-(3,'project','computeBurn'),
-(3,'project','doc'),
-(3,'project','dynamic'),
-(3,'project','grouptask'),
-(3,'project','importBug'),
-(3,'project','importtask'),
-(3,'project','index'),
-(3,'project','kanban'),
-(3,'project','story'),
-(3,'project','task'),
-(3,'project','team'),
-(3,'project','testtask'),
-(3,'project','tree'),
-(3,'project','view'),
+(3,'execution','all'),
+(3,'execution','browse'),
+(3,'execution','bug'),
+(3,'execution','build'),
+(3,'execution','burn'),
+(3,'execution','computeBurn'),
+(3,'execution','doc'),
+(3,'execution','dynamic'),
+(3,'execution','grouptask'),
+(3,'execution','importBug'),
+(3,'execution','importtask'),
+(3,'execution','index'),
+(3,'execution','kanban'),
+(3,'execution','story'),
+(3,'execution','task'),
+(3,'execution','team'),
+(3,'execution','testtask'),
+(3,'execution','tree'),
+(3,'execution','view'),
 (3,'projectstory','story'),
 (3,'projectstory','track'),
 (3,'projectstory','view'),
@@ -2298,6 +2308,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4,'job','exec'),
 (4,'misc','ping'),
 (4,'my','calendar'),
+(4,'my','team'),
+(4,'my','work'),
+(4,'my','contribute'),
 (4,'my','changePassword'),
 (4,'my','deleteContacts'),
 (4,'my','dynamic'),
@@ -2322,79 +2335,80 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4,'product','view'),
 (4,'productplan','browse'),
 (4,'productplan','view'),
-(4,'program','createGuide'),
-(4,'program','createStakeholder'),
 (4,'program','index'),
-(4,'program','PGMActivate'),
-(4,'program','PGMBrowse'),
-(4,'program','PGMClose'),
-(4,'program','PGMCreate'),
-(4,'program','PGMDelete'),
-(4,'program','PGMEdit'),
-(4,'program','PGMProduct'),
-(4,'program','PGMProject'),
-(4,'program','PGMStakeholder'),
-(4,'program','PGMStart'),
-(4,'program','PGMSuspend'),
 (4,'program','activate'),
-(4,'program','addWhitelist'),
 (4,'program','browse'),
 (4,'program','close'),
-(4,'program','copyGroup'),
 (4,'program','create'),
-(4,'program','createGroup'),
 (4,'program','delete'),
 (4,'program','edit'),
-(4,'program','editGroup'),
-(4,'program','group'),
-(4,'program','manageGroupMember'),
-(4,'program','manageMembers'),
-(4,'program','managePriv'),
-(4,'program','manageProducts'),
-(4,'program','manageView'),
-(4,'program','programTitle'),
+(4,'program','product'),
+(4,'program','project'),
+(4,'program','stakeholder'),
 (4,'program','start'),
 (4,'program','suspend'),
-(4,'program','updateOrder'),
-(4,'program','view'),
-(4,'program','whitelist'),
-(4,'program','unbindWhielist'),
-(4,'program','unlinkStakeholder'),
-(4,'project','activate'),
-(4,'project','all'),
-(4,'project','batchedit'),
-(4,'project','batchUnlinkStory'),
-(4,'project','browse'),
-(4,'project','bug'),
-(4,'project','build'),
-(4,'project','burn'),
-(4,'project','close'),
-(4,'project','computeBurn'),
-(4,'project','create'),
-(4,'project','delete'),
-(4,'project','doc'),
-(4,'project','dynamic'),
-(4,'project','edit'),
-(4,'project','grouptask'),
-(4,'project','importBug'),
-(4,'project','importtask'),
+(4,'project','createGuide'),
+(4,'project','createStakeholder'),
 (4,'project','index'),
-(4,'project','kanban'),
-(4,'project','linkStory'),
+(4,'project','activate'),
+(4,'project','addWhitelist'),
+(4,'project','browse'),
+(4,'project','close'),
+(4,'project','copyGroup'),
+(4,'project','create'),
+(4,'project','createGroup'),
+(4,'project','delete'),
+(4,'project','edit'),
+(4,'project','editGroup'),
+(4,'project','group'),
+(4,'project','manageGroupMember'),
 (4,'project','manageMembers'),
+(4,'project','managePriv'),
 (4,'project','manageProducts'),
-(4,'project','putoff'),
+(4,'project','manageView'),
+(4,'project','programTitle'),
 (4,'project','start'),
-(4,'project','story'),
 (4,'project','suspend'),
-(4,'project','task'),
-(4,'project','team'),
-(4,'project','testtask'),
-(4,'project','tree'),
-(4,'project','unlinkMember'),
-(4,'project','unlinkStory'),
 (4,'project','updateOrder'),
 (4,'project','view'),
+(4,'project','whitelist'),
+(4,'project','unbindWhielist'),
+(4,'project','unlinkStakeholder'),
+(4,'execution','activate'),
+(4,'execution','all'),
+(4,'execution','batchedit'),
+(4,'execution','batchUnlinkStory'),
+(4,'execution','browse'),
+(4,'execution','bug'),
+(4,'execution','build'),
+(4,'execution','burn'),
+(4,'execution','close'),
+(4,'execution','computeBurn'),
+(4,'execution','create'),
+(4,'execution','delete'),
+(4,'execution','doc'),
+(4,'execution','dynamic'),
+(4,'execution','edit'),
+(4,'execution','grouptask'),
+(4,'execution','importBug'),
+(4,'execution','importtask'),
+(4,'execution','index'),
+(4,'execution','kanban'),
+(4,'execution','linkStory'),
+(4,'execution','manageMembers'),
+(4,'execution','manageProducts'),
+(4,'execution','putoff'),
+(4,'execution','start'),
+(4,'execution','story'),
+(4,'execution','suspend'),
+(4,'execution','task'),
+(4,'execution','team'),
+(4,'execution','testtask'),
+(4,'execution','tree'),
+(4,'execution','unlinkMember'),
+(4,'execution','unlinkStory'),
+(4,'execution','updateOrder'),
+(4,'execution','view'),
 (4,'projectstory','story'),
 (4,'projectstory','track'),
 (4,'projectstory','view'),
@@ -2588,6 +2602,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'job','exec'),
 (5,'misc','ping'),
 (5,'my','calendar'),
+(5,'my','team'),
+(5,'my','work'),
+(5,'my','contribute'),
 (5,'my','changePassword'),
 (5,'my','deleteContacts'),
 (5,'my','dynamic'),
@@ -2627,79 +2644,80 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,'productplan','unlinkBug'),
 (5,'productplan','unlinkStory'),
 (5,'productplan','view'),
-(5,'program','createGuide'),
-(5,'program','createStakeholder'),
 (5,'program','index'),
-(5,'program','PGMActivate'),
-(5,'program','PGMBrowse'),
-(5,'program','PGMClose'),
-(5,'program','PGMCreate'),
-(5,'program','PGMDelete'),
-(5,'program','PGMEdit'),
-(5,'program','PGMProduct'),
-(5,'program','PGMProject'),
-(5,'program','PGMStakeholder'),
-(5,'program','PGMStart'),
-(5,'program','PGMSuspend'),
 (5,'program','activate'),
-(5,'program','addWhitelist'),
 (5,'program','browse'),
 (5,'program','close'),
-(5,'program','copyGroup'),
 (5,'program','create'),
-(5,'program','createGroup'),
 (5,'program','delete'),
 (5,'program','edit'),
-(5,'program','editGroup'),
-(5,'program','group'),
-(5,'program','manageGroupMember'),
-(5,'program','manageMembers'),
-(5,'program','managePriv'),
-(5,'program','manageProducts'),
-(5,'program','manageView'),
-(5,'program','programTitle'),
+(5,'program','product'),
+(5,'program','project'),
+(5,'program','stakeholder'),
 (5,'program','start'),
 (5,'program','suspend'),
-(5,'program','view'),
-(5,'program','updateOrder'),
-(5,'program','whitelist'),
-(5,'program','unbindWhielist'),
-(5,'program','unlinkStakeholder'),
-(5,'project','activate'),
-(5,'project','all'),
-(5,'project','batchedit'),
-(5,'project','batchUnlinkStory'),
-(5,'project','browse'),
-(5,'project','bug'),
-(5,'project','build'),
-(5,'project','burn'),
-(5,'project','close'),
-(5,'project','computeBurn'),
-(5,'project','create'),
-(5,'project','delete'),
-(5,'project','doc'),
-(5,'project','dynamic'),
-(5,'project','edit'),
-(5,'project','grouptask'),
-(5,'project','importBug'),
-(5,'project','importtask'),
+(5,'project','createGuide'),
+(5,'project','createStakeholder'),
 (5,'project','index'),
-(5,'project','kanban'),
-(5,'project','linkStory'),
+(5,'project','activate'),
+(5,'project','addWhitelist'),
+(5,'project','browse'),
+(5,'project','close'),
+(5,'project','copyGroup'),
+(5,'project','create'),
+(5,'project','createGroup'),
+(5,'project','delete'),
+(5,'project','edit'),
+(5,'project','editGroup'),
+(5,'project','group'),
+(5,'project','manageGroupMember'),
 (5,'project','manageMembers'),
+(5,'project','managePriv'),
 (5,'project','manageProducts'),
-(5,'project','putoff'),
+(5,'project','manageView'),
+(5,'project','programTitle'),
 (5,'project','start'),
-(5,'project','story'),
 (5,'project','suspend'),
-(5,'project','task'),
-(5,'project','team'),
-(5,'project','testtask'),
-(5,'project','tree'),
-(5,'project','unlinkMember'),
-(5,'project','unlinkStory'),
-(5,'project','updateOrder'),
 (5,'project','view'),
+(5,'project','updateOrder'),
+(5,'project','whitelist'),
+(5,'project','unbindWhielist'),
+(5,'project','unlinkStakeholder'),
+(5,'execution','activate'),
+(5,'execution','all'),
+(5,'execution','batchedit'),
+(5,'execution','batchUnlinkStory'),
+(5,'execution','browse'),
+(5,'execution','bug'),
+(5,'execution','build'),
+(5,'execution','burn'),
+(5,'execution','close'),
+(5,'execution','computeBurn'),
+(5,'execution','create'),
+(5,'execution','delete'),
+(5,'execution','doc'),
+(5,'execution','dynamic'),
+(5,'execution','edit'),
+(5,'execution','grouptask'),
+(5,'execution','importBug'),
+(5,'execution','importtask'),
+(5,'execution','index'),
+(5,'execution','kanban'),
+(5,'execution','linkStory'),
+(5,'execution','manageMembers'),
+(5,'execution','manageProducts'),
+(5,'execution','putoff'),
+(5,'execution','start'),
+(5,'execution','story'),
+(5,'execution','suspend'),
+(5,'execution','task'),
+(5,'execution','team'),
+(5,'execution','testtask'),
+(5,'execution','tree'),
+(5,'execution','unlinkMember'),
+(5,'execution','unlinkStory'),
+(5,'execution','updateOrder'),
+(5,'execution','view'),
 (5,'projectstory','linkStory'),
 (5,'projectstory','story'),
 (5,'projectstory','track'),
@@ -2897,6 +2915,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6,'index','index'),
 (6,'misc','ping'),
 (6,'my','calendar'),
+(6,'my','team'),
+(6,'my','work'),
+(6,'my','contribute'),
 (6,'my','changePassword'),
 (6,'my','deleteContacts'),
 (6,'my','dynamic'),
@@ -2921,79 +2942,80 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6,'product','view'),
 (6,'productplan','browse'),
 (6,'productplan','view'),
-(6,'program','createGuide'),
-(6,'program','createStakeholder'),
 (6,'program','index'),
-(6,'program','PGMActivate'),
-(6,'program','PGMBrowse'),
-(6,'program','PGMClose'),
-(6,'program','PGMCreate'),
-(6,'program','PGMDelete'),
-(6,'program','PGMEdit'),
-(6,'program','PGMProduct'),
-(6,'program','PGMProject'),
-(6,'program','PGMStakeholder'),
-(6,'program','PGMStart'),
-(6,'program','PGMSuspend'),
 (6,'program','activate'),
-(6,'program','addWhitelist'),
 (6,'program','browse'),
 (6,'program','close'),
-(6,'program','copyGroup'),
 (6,'program','create'),
-(6,'program','createGroup'),
 (6,'program','delete'),
 (6,'program','edit'),
-(6,'program','editGroup'),
-(6,'program','group'),
-(6,'program','manageGroupMember'),
-(6,'program','manageMembers'),
-(6,'program','managePriv'),
-(6,'program','manageProducts'),
-(6,'program','manageView'),
-(6,'program','programTitle'),
+(6,'program','product'),
+(6,'program','project'),
+(6,'program','stakeholder'),
 (6,'program','start'),
 (6,'program','suspend'),
-(6,'program','view'),
-(6,'program','updateOrder'),
-(6,'program','whitelist'),
-(6,'program','unbindWhielist'),
-(6,'program','unlinkStakeholder'),
-(6,'project','activate'),
-(6,'project','all'),
-(6,'project','batchedit'),
-(6,'project','batchUnlinkStory'),
-(6,'project','browse'),
-(6,'project','bug'),
-(6,'project','build'),
-(6,'project','burn'),
-(6,'project','close'),
-(6,'project','computeBurn'),
-(6,'project','create'),
-(6,'project','delete'),
-(6,'project','doc'),
-(6,'project','dynamic'),
-(6,'project','edit'),
-(6,'project','grouptask'),
-(6,'project','importBug'),
-(6,'project','importtask'),
+(6,'project','createGuide'),
+(6,'project','createStakeholder'),
 (6,'project','index'),
-(6,'project','kanban'),
-(6,'project','linkStory'),
+(6,'project','activate'),
+(6,'project','addWhitelist'),
+(6,'project','browse'),
+(6,'project','close'),
+(6,'project','copyGroup'),
+(6,'project','create'),
+(6,'project','createGroup'),
+(6,'project','delete'),
+(6,'project','edit'),
+(6,'project','editGroup'),
+(6,'project','group'),
+(6,'project','manageGroupMember'),
 (6,'project','manageMembers'),
+(6,'project','managePriv'),
 (6,'project','manageProducts'),
-(6,'project','putoff'),
+(6,'project','manageView'),
+(6,'project','programTitle'),
 (6,'project','start'),
-(6,'project','story'),
 (6,'project','suspend'),
-(6,'project','task'),
-(6,'project','team'),
-(6,'project','testtask'),
-(6,'project','tree'),
-(6,'project','unlinkMember'),
-(6,'project','unlinkStory'),
-(6,'project','updateOrder'),
 (6,'project','view'),
+(6,'project','updateOrder'),
+(6,'project','whitelist'),
+(6,'project','unbindWhielist'),
+(6,'project','unlinkStakeholder'),
+(6,'execution','activate'),
+(6,'execution','all'),
+(6,'execution','batchedit'),
+(6,'execution','batchUnlinkStory'),
+(6,'execution','browse'),
+(6,'execution','bug'),
+(6,'execution','build'),
+(6,'execution','burn'),
+(6,'execution','close'),
+(6,'execution','computeBurn'),
+(6,'execution','create'),
+(6,'execution','delete'),
+(6,'execution','doc'),
+(6,'execution','dynamic'),
+(6,'execution','edit'),
+(6,'execution','grouptask'),
+(6,'execution','importBug'),
+(6,'execution','importtask'),
+(6,'execution','index'),
+(6,'execution','kanban'),
+(6,'execution','linkStory'),
+(6,'execution','manageMembers'),
+(6,'execution','manageProducts'),
+(6,'execution','putoff'),
+(6,'execution','start'),
+(6,'execution','story'),
+(6,'execution','suspend'),
+(6,'execution','task'),
+(6,'execution','team'),
+(6,'execution','testtask'),
+(6,'execution','tree'),
+(6,'execution','unlinkMember'),
+(6,'execution','unlinkStory'),
+(6,'execution','updateOrder'),
+(6,'execution','view'),
 (6,'projectstory','story'),
 (6,'projectstory','track'),
 (6,'projectstory','view'),
@@ -3169,6 +3191,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'index','index'),
 (7,'misc','ping'),
 (7,'my','calendar'),
+(7,'my','team'),
+(7,'my','work'),
+(7,'my','contribute'),
 (7,'my','changePassword'),
 (7,'my','deleteContacts'),
 (7,'my','dynamic'),
@@ -3208,63 +3233,64 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,'productplan','unlinkBug'),
 (7,'productplan','unlinkStory'),
 (7,'productplan','view'),
-(7,'program','createGuide'),
-(7,'program','createStakeholder'),
 (7,'program','index'),
-(7,'program','PGMActivate'),
-(7,'program','PGMBrowse'),
-(7,'program','PGMClose'),
-(7,'program','PGMCreate'),
-(7,'program','PGMDelete'),
-(7,'program','PGMEdit'),
-(7,'program','PGMProduct'),
-(7,'program','PGMProject'),
-(7,'program','PGMStakeholder'),
-(7,'program','PGMStart'),
-(7,'program','PGMSuspend'),
 (7,'program','activate'),
-(7,'program','addWhitelist'),
 (7,'program','browse'),
 (7,'program','close'),
-(7,'program','copyGroup'),
 (7,'program','create'),
-(7,'program','createGroup'),
 (7,'program','delete'),
 (7,'program','edit'),
-(7,'program','editGroup'),
-(7,'program','group'),
-(7,'program','manageGroupMember'),
-(7,'program','manageMembers'),
-(7,'program','managePriv'),
-(7,'program','manageProducts'),
-(7,'program','manageView'),
-(7,'program','programTitle'),
+(7,'program','product'),
+(7,'program','project'),
+(7,'program','stakeholder'),
 (7,'program','start'),
 (7,'program','suspend'),
-(7,'program','view'),
-(7,'program','updateOrder'),
-(7,'program','whitelist'),
-(7,'program','unbindWhielist'),
-(7,'program','unlinkStakeholder'),
-(7,'project','all'),
-(7,'project','browse'),
-(7,'project','bug'),
-(7,'project','build'),
-(7,'project','burn'),
-(7,'project','doc'),
-(7,'project','dynamic'),
-(7,'project','grouptask'),
+(7,'project','createGuide'),
+(7,'project','createStakeholder'),
 (7,'project','index'),
-(7,'project','kanban'),
-(7,'project','linkStory'),
+(7,'project','activate'),
+(7,'project','addWhitelist'),
+(7,'project','browse'),
+(7,'project','close'),
+(7,'project','copyGroup'),
+(7,'project','create'),
+(7,'project','createGroup'),
+(7,'project','delete'),
+(7,'project','edit'),
+(7,'project','editGroup'),
+(7,'project','group'),
+(7,'project','manageGroupMember'),
+(7,'project','manageMembers'),
+(7,'project','managePriv'),
 (7,'project','manageProducts'),
-(7,'project','story'),
-(7,'project','task'),
-(7,'project','team'),
-(7,'project','testtask'),
-(7,'project','tree'),
-(7,'project','unlinkStory'),
+(7,'project','manageView'),
+(7,'project','programTitle'),
+(7,'project','start'),
+(7,'project','suspend'),
 (7,'project','view'),
+(7,'project','updateOrder'),
+(7,'project','whitelist'),
+(7,'project','unbindWhielist'),
+(7,'project','unlinkStakeholder'),
+(7,'execution','all'),
+(7,'execution','browse'),
+(7,'execution','bug'),
+(7,'execution','build'),
+(7,'execution','burn'),
+(7,'execution','doc'),
+(7,'execution','dynamic'),
+(7,'execution','grouptask'),
+(7,'execution','index'),
+(7,'execution','kanban'),
+(7,'execution','linkStory'),
+(7,'execution','manageProducts'),
+(7,'execution','story'),
+(7,'execution','task'),
+(7,'execution','team'),
+(7,'execution','testtask'),
+(7,'execution','tree'),
+(7,'execution','unlinkStory'),
+(7,'execution','view'),
 (7,'projectstory','linkStory'),
 (7,'projectstory','story'),
 (7,'projectstory','track'),
@@ -3453,6 +3479,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,'index','index'),
 (8,'misc','ping'),
 (8,'my','calendar'),
+(8,'my','team'),
+(8,'my','work'),
+(8,'my','contribute'),
 (8,'my','changePassword'),
 (8,'my','deleteContacts'),
 (8,'my','dynamic'),
@@ -3477,61 +3506,62 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,'product','view'),
 (8,'productplan','browse'),
 (8,'productplan','view'),
-(8,'program','createGuide'),
-(8,'program','createStakeholder'),
 (8,'program','index'),
-(8,'program','PGMActivate'),
-(8,'program','PGMBrowse'),
-(8,'program','PGMClose'),
-(8,'program','PGMCreate'),
-(8,'program','PGMDelete'),
-(8,'program','PGMEdit'),
-(8,'program','PGMProduct'),
-(8,'program','PGMProject'),
-(8,'program','PGMStakeholder'),
-(8,'program','PGMStart'),
-(8,'program','PGMSuspend'),
 (8,'program','activate'),
-(8,'program','addWhitelist'),
 (8,'program','browse'),
 (8,'program','close'),
-(8,'program','copyGroup'),
 (8,'program','create'),
-(8,'program','createGroup'),
 (8,'program','delete'),
 (8,'program','edit'),
-(8,'program','editGroup'),
-(8,'program','group'),
-(8,'program','manageGroupMember'),
-(8,'program','manageMembers'),
-(8,'program','managePriv'),
-(8,'program','manageProducts'),
-(8,'program','manageView'),
-(8,'program','programTitle'),
+(8,'program','product'),
+(8,'program','project'),
+(8,'program','stakeholder'),
 (8,'program','start'),
 (8,'program','suspend'),
-(8,'program','view'),
-(8,'program','updateOrder'),
-(8,'program','whitelist'),
-(8,'program','unbindWhielist'),
-(8,'program','unlinkStakeholder'),
-(8,'project','all'),
-(8,'project','bug'),
-(8,'project','build'),
-(8,'project','burn'),
-(8,'project','doc'),
-(8,'project','dynamic'),
-(8,'project','grouptask'),
-(8,'project','importBug'),
-(8,'project','importtask'),
+(8,'project','createGuide'),
+(8,'project','createStakeholder'),
 (8,'project','index'),
-(8,'project','kanban'),
-(8,'project','story'),
-(8,'project','task'),
-(8,'project','team'),
-(8,'project','testtask'),
-(8,'project','tree'),
+(8,'project','activate'),
+(8,'project','addWhitelist'),
+(8,'project','browse'),
+(8,'project','close'),
+(8,'project','copyGroup'),
+(8,'project','create'),
+(8,'project','createGroup'),
+(8,'project','delete'),
+(8,'project','edit'),
+(8,'project','editGroup'),
+(8,'project','group'),
+(8,'project','manageGroupMember'),
+(8,'project','manageMembers'),
+(8,'project','managePriv'),
+(8,'project','manageProducts'),
+(8,'project','manageView'),
+(8,'project','programTitle'),
+(8,'project','start'),
+(8,'project','suspend'),
 (8,'project','view'),
+(8,'project','updateOrder'),
+(8,'project','whitelist'),
+(8,'project','unbindWhielist'),
+(8,'project','unlinkStakeholder'),
+(8,'execution','all'),
+(8,'execution','bug'),
+(8,'execution','build'),
+(8,'execution','burn'),
+(8,'execution','doc'),
+(8,'execution','dynamic'),
+(8,'execution','grouptask'),
+(8,'execution','importBug'),
+(8,'execution','importtask'),
+(8,'execution','index'),
+(8,'execution','kanban'),
+(8,'execution','story'),
+(8,'execution','task'),
+(8,'execution','team'),
+(8,'execution','testtask'),
+(8,'execution','tree'),
+(8,'execution','view'),
 (8,'projectstory','story'),
 (8,'projectstory','track'),
 (8,'projectstory','view'),
@@ -3732,6 +3762,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,'index','index'),
 (9,'misc','ping'),
 (9,'my','calendar'),
+(9,'my','team'),
+(9,'my','work'),
+(9,'my','contribute'),
 (9,'my','changePassword'),
 (9,'my','deleteContacts'),
 (9,'my','dynamic'),
@@ -3756,60 +3789,61 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,'product','view'),
 (9,'productplan','browse'),
 (9,'productplan','view'),
-(9,'program','createGuide'),
-(9,'program','createStakeholder'),
 (9,'program','index'),
-(9,'program','PGMActivate'),
-(9,'program','PGMBrowse'),
-(9,'program','PGMClose'),
-(9,'program','PGMCreate'),
-(9,'program','PGMDelete'),
-(9,'program','PGMEdit'),
-(9,'program','PGMProduct'),
-(9,'program','PGMProject'),
-(9,'program','PGMStakeholder'),
-(9,'program','PGMStart'),
-(9,'program','PGMSuspend'),
 (9,'program','activate'),
-(9,'program','addWhitelist'),
 (9,'program','browse'),
 (9,'program','close'),
-(9,'program','copyGroup'),
 (9,'program','create'),
-(9,'program','createGroup'),
 (9,'program','delete'),
 (9,'program','edit'),
-(9,'program','editGroup'),
-(9,'program','group'),
-(9,'program','manageGroupMember'),
-(9,'program','manageMembers'),
-(9,'program','managePriv'),
-(9,'program','manageProducts'),
-(9,'program','manageView'),
-(9,'program','programTitle'),
+(9,'program','product'),
+(9,'program','project'),
+(9,'program','stakeholder'),
 (9,'program','start'),
 (9,'program','suspend'),
-(9,'program','view'),
-(9,'program','updateOrder'),
-(9,'program','whitelist'),
-(9,'program','unbindWhielist'),
-(9,'program','unlinkStakeholder'),
-(9,'project','all'),
-(9,'project','browse'),
-(9,'project','bug'),
-(9,'project','build'),
-(9,'project','burn'),
-(9,'project','computeBurn'),
-(9,'project','doc'),
-(9,'project','dynamic'),
-(9,'project','grouptask'),
+(9,'project','createGuide'),
+(9,'project','createStakeholder'),
 (9,'project','index'),
-(9,'project','kanban'),
-(9,'project','story'),
-(9,'project','task'),
-(9,'project','team'),
-(9,'project','tree'),
+(9,'project','activate'),
+(9,'project','addWhitelist'),
+(9,'project','browse'),
+(9,'project','close'),
+(9,'project','copyGroup'),
+(9,'project','create'),
+(9,'project','createGroup'),
+(9,'project','delete'),
+(9,'project','edit'),
+(9,'project','editGroup'),
+(9,'project','group'),
+(9,'project','manageGroupMember'),
+(9,'project','manageMembers'),
+(9,'project','managePriv'),
+(9,'project','manageProducts'),
+(9,'project','manageView'),
+(9,'project','programTitle'),
+(9,'project','start'),
+(9,'project','suspend'),
 (9,'project','view'),
+(9,'project','updateOrder'),
+(9,'project','whitelist'),
+(9,'project','unbindWhielist'),
+(9,'project','unlinkStakeholder'),
+(9,'execution','all'),
+(9,'execution','browse'),
+(9,'execution','bug'),
+(9,'execution','build'),
+(9,'execution','burn'),
+(9,'execution','computeBurn'),
+(9,'execution','doc'),
+(9,'execution','dynamic'),
+(9,'execution','grouptask'),
+(9,'execution','index'),
+(9,'execution','kanban'),
+(9,'execution','story'),
+(9,'execution','task'),
+(9,'execution','team'),
+(9,'execution','tree'),
+(9,'execution','view'),
 (9,'projectstory','linkStory'),
 (9,'projectstory','story'),
 (9,'projectstory','track'),
@@ -3930,6 +3964,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10,'index','index'),
 (10,'misc','ping'),
 (10,'my','calendar'),
+(10,'my','team'),
+(10,'my','work'),
+(10,'my','contribute'),
 (10,'my','changePassword'),
 (10,'my','dynamic'),
 (10,'my','editProfile'),
@@ -3950,22 +3987,22 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10,'product','view'),
 (10,'productplan','browse'),
 (10,'productplan','view'),
-(10,'project','all'),
-(10,'project','browse'),
-(10,'project','bug'),
-(10,'project','build'),
-(10,'project','burn'),
-(10,'project','doc'),
-(10,'project','dynamic'),
-(10,'project','grouptask'),
-(10,'project','index'),
-(10,'project','kanban'),
-(10,'project','story'),
-(10,'project','task'),
-(10,'project','team'),
-(10,'project','testtask'),
-(10,'project','tree'),
-(10,'project','view'),
+(10,'execution','all'),
+(10,'execution','browse'),
+(10,'execution','bug'),
+(10,'execution','build'),
+(10,'execution','burn'),
+(10,'execution','doc'),
+(10,'execution','dynamic'),
+(10,'execution','grouptask'),
+(10,'execution','index'),
+(10,'execution','kanban'),
+(10,'execution','story'),
+(10,'execution','task'),
+(10,'execution','team'),
+(10,'execution','testtask'),
+(10,'execution','tree'),
+(10,'execution','view'),
 (10,'projectstory','story'),
 (10,'projectstory','track'),
 (10,'projectstory','view'),
@@ -4065,24 +4102,24 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (11,'product','view'),
 (11,'productplan','browse'),
 (11,'productplan','view'),
-(11,'project','all'),
-(11,'project','browse'),
-(11,'project','bug'),
-(11,'project','build'),
-(11,'project','burn'),
-(11,'project','doc'),
-(11,'project','dynamic'),
-(11,'project','grouptask'),
-(11,'project','index'),
-(11,'project','kanban'),
-(11,'project','story'),
-(11,'project','task'),
-(11,'project','team'),
-(11,'project','testtask'),
-(11,'project','tree'),
-(11,'project','treestory'),
-(11,'project','treetask'),
-(11,'project','view'),
+(11,'execution','all'),
+(11,'execution','browse'),
+(11,'execution','bug'),
+(11,'execution','build'),
+(11,'execution','burn'),
+(11,'execution','doc'),
+(11,'execution','dynamic'),
+(11,'execution','grouptask'),
+(11,'execution','index'),
+(11,'execution','kanban'),
+(11,'execution','story'),
+(11,'execution','task'),
+(11,'execution','team'),
+(11,'execution','testtask'),
+(11,'execution','tree'),
+(11,'execution','treestory'),
+(11,'execution','treetask'),
+(11,'execution','view'),
 (11,'projectstory','story'),
 (11,'projectstory','track'),
 (11,'projectstory','view'),
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index ab589becd3..d75330bdea 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -3989,9 +3989,12 @@ class upgradeModel extends model
 
             $groupPriv->method = 'contribute';
             $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
+
+            $groupPriv->method = 'team';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
         }
 
-        $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('program')->andWhere('method')->like('PGM%')->query();
+        $stmt = $this->dao->select('group,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('program')->andWhere('method')->like('PGM%')->query();
         while($grouppriv = $stmt->fetch())
         {
             $this->dao->delete()->from(TABLE_GROUPPRIV)->where('module')->eq($grouppriv->module)->andWhere('method')->eq($grouppriv->method)->exec();
@@ -4002,7 +4005,7 @@ class upgradeModel extends model
             $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
         }
 
-        $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('program')->andWhere('method')->like('PRJ%')->query();
+        $stmt = $this->dao->select('group,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('program')->andWhere('method')->like('PRJ%')->query();
         while($grouppriv = $stmt->fetch())
         {
             $this->dao->delete()->from(TABLE_GROUPPRIV)->where('module')->eq($grouppriv->module)->andWhere('method')->eq($grouppriv->method)->exec();
@@ -4014,7 +4017,7 @@ class upgradeModel extends model
             $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
         }
 
-        $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('story')->query();
+        $stmt = $this->dao->select('group,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('story')->query();
         while($grouppriv = $stmt->fetch())
         {
             $grouppriv->module = 'projectstory';
@@ -4022,7 +4025,7 @@ class upgradeModel extends model
             $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
         }
 
-        $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('story')->andWhere('method')->eq('view')->query();
+        $stmt = $this->dao->select('group,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('story')->andWhere('method')->eq('view')->query();
         while($grouppriv = $stmt->fetch())
         {
             $grouppriv->module = 'projectstory';
@@ -4030,7 +4033,7 @@ class upgradeModel extends model
             $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
         }
 
-        $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('linkstory')->query();
+        $stmt = $this->dao->select('group,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('linkstory')->query();
         while($grouppriv = $stmt->fetch())
         {
             $grouppriv->module = 'projectstory';
@@ -4038,7 +4041,7 @@ class upgradeModel extends model
             $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
         }
 
-        $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('unlinkstory')->query();
+        $stmt = $this->dao->select('group,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('project')->andWhere('method')->eq('unlinkstory')->query();
         while($grouppriv = $stmt->fetch())
         {
             $grouppriv->module = 'projectstory';
@@ -4046,22 +4049,30 @@ class upgradeModel extends model
             $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
         }
 
-        $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('execution')->andWhere('method')->eq('all')->query();
+        $stmt = $this->dao->select('group,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('execution')->andWhere('method')->eq('all')->query();
         while($grouppriv = $stmt->fetch())
         {
             $grouppriv->module = 'project';
             $grouppriv->method = 'execution';
             $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+
+            $grouppriv->module = 'project';
+            $grouppriv->method = 'browse';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
+
+            $grouppriv->module = 'project';
+            $grouppriv->method = 'index';
+            $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
         }
 
-        $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('doc')->andWhere('method')->eq('createlib')->query();
+        $stmt = $this->dao->select('group,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('doc')->andWhere('method')->eq('createlib')->query();
         while($grouppriv = $stmt->fetch())
         {
             $grouppriv->method = 'createLib';
             $this->dao->replace(TABLE_GROUPPRIV)->data($grouppriv)->exec();
         }
 
-        $stmt = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('module')->eq('doc')->andWhere('method')->eq('editlib')->query();
+        $stmt = $this->dao->select('group,module,method')->from(TABLE_GROUPPRIV)->where('module')->eq('doc')->andWhere('method')->eq('editlib')->query();
         while($grouppriv = $stmt->fetch())
         {
             $grouppriv->method = 'editLib';