diff --git a/db/zentao.sql b/db/zentao.sql
index fff20e3737..f15b0f2a54 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -708,18 +708,6 @@ CREATE TABLE IF NOT EXISTS `zt_webapp` (
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-INSERT INTO `zt_group` (`id`, `company`, `name`, `role`, `desc`) VALUES
-(1, 1, 'ADMIN', 'admin', 'for administrator'),
-(2, 1, 'DEV', 'dev', 'for developers.'),
-(3, 1, 'QA', 'qa', 'for testers.'),
-(4, 1, 'PM', 'pm', 'for project managers.'),
-(5, 1, 'PO', 'po', 'for product owners.'),
-(6, 1, 'TD', 'td', 'for technical director.'),
-(7, 1, 'PD', 'pd', 'for product director.'),
-(8, 1, 'QD', 'qd', 'for quality director.'),
-(9, 1, 'TOP', 'top', 'for top manager.'),
-(10, 1, 'OTHERS', '', 'for others.'),
-(11, 1, 'guest', 'guest', 'For guest');
 INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
 (1, 1, 'project', 'suspend'),
 (1, 1, 'testtask', 'index'),
@@ -869,301 +857,300 @@ INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
 (1, 1, 'bug', 'deleteTemplate'),
 (1, 1, 'user', 'todo'),
 (1, 1, 'testcase', 'create'),
-(1, 1, 'task', 'editEstimate'),
 (1, 1, 'product', 'roadmap'),
-(1, 7, 'my', 'testTask'),
-(1, 5, 'report', 'productInfo'),
-(1, 5, 'report', 'workload'),
-(1, 5, 'productplan', 'linkStory'),
-(1, 5, 'todo', 'edit'),
-(1, 5, 'group', 'browse'),
-(1, 5, 'product', 'edit'),
-(1, 5, 'testtask', 'cases'),
-(1, 5, 'tree', 'manageChild'),
-(1, 5, 'bug', 'create'),
-(1, 5, 'todo', 'batchEdit'),
-(1, 5, 'user', 'project'),
-(1, 5, 'tree', 'fix'),
-(1, 5, 'project', 'burn'),
-(1, 5, 'productplan', 'view'),
-(1, 5, 'tree', 'browse'),
-(1, 5, 'project', 'index'),
-(1, 5, 'company', 'browse'),
-(1, 5, 'my', 'bug'),
-(1, 5, 'my', 'task'),
-(1, 5, 'my', 'index'),
-(1, 5, 'search', 'select'),
-(1, 5, 'user', 'view'),
-(1, 5, 'bug', 'export'),
-(1, 5, 'productplan', 'browse'),
-(1, 5, 'story', 'batchClose'),
-(1, 5, 'productplan', 'edit'),
-(1, 7, 'my', 'profile'),
-(1, 5, 'productplan', 'delete'),
-(1, 5, 'project', 'view'),
-(1, 5, 'product', 'create'),
-(1, 5, 'task', 'report'),
-(1, 5, 'testtask', 'index'),
-(1, 7, 'my', 'todo'),
-(1, 5, 'file', 'delete'),
-(1, 5, 'search', 'saveQuery'),
-(1, 5, 'product', 'roadmap'),
-(1, 5, 'product', 'browse'),
-(1, 5, 'svn', 'apiSync'),
-(1, 5, 'testtask', 'view'),
-(1, 5, 'testcase', 'export'),
-(1, 5, 'todo', 'view'),
-(1, 5, 'product', 'index'),
-(1, 5, 'user', 'dynamic'),
-(1, 5, 'productplan', 'unlinkStory'),
-(1, 5, 'user', 'bug'),
-(1, 5, 'task', 'view'),
-(1, 5, 'svn', 'cat'),
-(1, 5, 'project', 'grouptask'),
-(1, 5, 'bug', 'batchEdit'),
-(1, 7, 'my', 'editProfile'),
-(1, 5, 'project', 'doc'),
-(1, 5, 'story', 'close'),
-(1, 5, 'project', 'linkStory'),
-(1, 5, 'product', 'delete'),
-(1, 7, 'my', 'changePassword'),
-(1, 5, 'my', 'profile'),
-(1, 5, 'report', 'bugSummary'),
-(1, 5, 'report', 'projectDeviation'),
-(1, 7, 'my', 'testCase'),
-(1, 5, 'index', 'index'),
-(1, 5, 'testcase', 'index'),
-(1, 5, 'release', 'delete'),
-(1, 5, 'doc', 'edit'),
-(1, 5, 'bug', 'resolve'),
+(1, 7, 'doc', 'browse'),
 (1, 5, 'release', 'view'),
-(1, 5, 'doc', 'delete'),
+(1, 5, 'release', 'edit'),
+(1, 5, 'bug', 'edit'),
+(1, 5, 'todo', 'export'),
+(1, 5, 'company', 'index'),
+(1, 5, 'testcase', 'view'),
+(1, 5, 'product', 'edit'),
+(1, 5, 'my', 'profile'),
+(1, 5, 'file', 'edit'),
+(1, 5, 'todo', 'batchEdit'),
+(1, 5, 'my', 'bug'),
 (1, 5, 'my', 'dynamic'),
-(1, 5, 'my', 'changePassword'),
-(1, 5, 'my', 'testTask'),
+(1, 5, 'build', 'view'),
+(1, 5, 'bug', 'create'),
+(1, 5, 'todo', 'create'),
+(1, 5, 'project', 'linkStory'),
+(1, 5, 'search', 'buildQuery'),
+(1, 5, 'report', 'productInfo'),
+(1, 5, 'doc', 'editLib'),
+(1, 5, 'doc', 'edit'),
+(1, 5, 'productplan', 'view'),
+(1, 5, 'my', 'index'),
+(1, 5, 'tree', 'edit'),
+(1, 5, 'bug', 'saveTemplate'),
+(1, 5, 'productplan', 'edit'),
+(1, 5, 'bug', 'resolve'),
+(1, 7, 'doc', 'view'),
+(1, 5, 'bug', 'report'),
+(1, 5, 'project', 'bug'),
+(1, 5, 'testtask', 'view'),
 (1, 5, 'product', 'close'),
+(1, 5, 'product', 'view'),
+(1, 7, 'doc', 'index'),
+(1, 5, 'group', 'browse'),
+(1, 5, 'productplan', 'linkStory'),
+(1, 5, 'bug', 'customFields'),
+(1, 5, 'testtask', 'results'),
+(1, 5, 'story', 'export'),
+(1, 5, 'product', 'browse'),
+(1, 5, 'product', 'doc'),
+(1, 5, 'todo', 'batchCreate'),
+(1, 5, 'testcase', 'browse'),
+(1, 5, 'my', 'testCase'),
+(1, 5, 'bug', 'view'),
+(1, 5, 'my', 'story'),
+(1, 5, 'product', 'project'),
+(1, 5, 'story', 'edit'),
+(1, 5, 'task', 'view'),
+(1, 5, 'misc', 'ping'),
+(1, 7, 'doc', 'delete'),
+(1, 5, 'task', 'recordEstimate'),
+(1, 5, 'story', 'report'),
+(1, 5, 'project', 'manageProducts'),
+(1, 5, 'testtask', 'browse'),
+(1, 7, 'report', 'projectDeviation'),
+(1, 5, 'doc', 'view'),
+(1, 5, 'project', 'index'),
+(1, 5, 'release', 'delete'),
+(1, 7, 'doc', 'createLib'),
+(1, 5, 'report', 'workload'),
+(1, 5, 'product', 'roadmap'),
+(1, 5, 'project', 'grouptask'),
+(1, 5, 'user', 'bug'),
+(1, 5, 'tree', 'browse'),
+(1, 5, 'project', 'view'),
+(1, 5, 'user', 'dynamic'),
+(1, 5, 'report', 'index'),
+(1, 5, 'report', 'projectDeviation'),
+(1, 5, 'doc', 'browse'),
+(1, 5, 'testtask', 'cases'),
+(1, 5, 'doc', 'create'),
+(1, 5, 'doc', 'index'),
+(1, 5, 'user', 'project'),
+(1, 5, 'task', 'report'),
+(1, 7, 'report', 'productInfo'),
 (1, 5, 'my', 'project'),
-(1, 5, 'my', 'todo'),
-(1, 5, 'doc', 'deleteLib'),
-(1, 5, 'project', 'burnData'),
-(1, 7, 'my', 'bug'),
-(1, 5, 'tree', 'updateOrder'),
-(1, 5, 'search', 'deleteQuery'),
-(1, 2, 'todo', 'import2Today'),
-(1, 2, 'product', 'doc'),
-(1, 2, 'svn', 'cat'),
-(1, 2, 'svn', 'apiSync'),
-(1, 7, 'todo', 'create'),
-(1, 7, 'todo', 'batchEdit'),
-(1, 2, 'todo', 'export'),
-(1, 2, 'release', 'browse'),
-(1, 2, 'testcase', 'browse'),
-(1, 2, 'doc', 'createLib'),
-(1, 2, 'report', 'index'),
-(1, 2, 'doc', 'index'),
-(1, 2, 'product', 'roadmap'),
-(1, 2, 'project', 'dynamic'),
-(1, 2, 'user', 'task'),
-(1, 2, 'doc', 'view'),
-(1, 2, 'todo', 'edit'),
-(1, 2, 'todo', 'batchEdit'),
-(1, 2, 'task', 'confirmStoryChange'),
-(1, 2, 'report', 'workload'),
-(1, 2, 'company', 'browse'),
-(1, 2, 'task', 'batchClose'),
-(1, 2, 'bug', 'customFields'),
-(1, 7, 'todo', 'delete'),
-(1, 2, 'project', 'browse'),
-(1, 2, 'qa', 'index'),
-(1, 2, 'user', 'bug'),
-(1, 2, 'project', 'story'),
-(1, 2, 'release', 'export'),
-(1, 2, 'file', 'download'),
-(1, 2, 'search', 'buildQuery'),
-(1, 2, 'project', 'view'),
+(1, 5, 'productplan', 'unlinkStory'),
 (1, 2, 'doc', 'deleteLib'),
-(1, 2, 'search', 'buildForm'),
-(1, 7, 'story', 'export'),
-(1, 7, 'story', 'edit'),
-(1, 2, 'task', 'assignTo'),
-(1, 7, 'todo', 'export'),
-(1, 2, 'user', 'dynamic'),
-(1, 2, 'task', 'finish'),
-(1, 2, 'todo', 'finish'),
-(1, 2, 'productplan', 'browse'),
-(1, 2, 'testtask', 'cases'),
-(1, 2, 'doc', 'editLib'),
-(1, 2, 'testtask', 'results'),
-(1, 2, 'doc', 'edit'),
-(1, 2, 'user', 'view'),
+(1, 2, 'product', 'browse'),
+(1, 2, 'bug', 'edit'),
+(1, 2, 'task', 'report'),
+(1, 7, 'todo', 'import2Today'),
+(1, 7, 'todo', 'batchEdit'),
+(1, 2, 'todo', 'view'),
 (1, 2, 'story', 'tasks'),
+(1, 2, 'testtask', 'index'),
+(1, 2, 'my', 'task'),
+(1, 2, 'release', 'export'),
+(1, 2, 'svn', 'diff'),
+(1, 2, 'product', 'dynamic'),
+(1, 2, 'file', 'delete'),
+(1, 2, 'testtask', 'results'),
+(1, 2, 'user', 'dynamic'),
+(1, 2, 'todo', 'export'),
+(1, 2, 'todo', 'edit'),
+(1, 2, 'task', 'deleteEstimate'),
+(1, 2, 'project', 'browse'),
+(1, 2, 'project', 'burn'),
+(1, 2, 'qa', 'index'),
+(1, 2, 'report', 'productInfo'),
+(1, 7, 'todo', 'finish'),
+(1, 2, 'search', 'buildForm'),
+(1, 2, 'productplan', 'view'),
+(1, 2, 'doc', 'createLib'),
+(1, 2, 'task', 'editEstimate'),
+(1, 2, 'project', 'view'),
+(1, 2, 'task', 'view'),
+(1, 2, 'story', 'report'),
+(1, 2, 'release', 'view'),
+(1, 2, 'my', 'index'),
+(1, 2, 'project', 'task'),
+(1, 7, 'story', 'close'),
+(1, 7, 'story', 'batchClose'),
+(1, 2, 'bug', 'report'),
+(1, 7, 'todo', 'delete'),
 (1, 2, 'doc', 'browse'),
-(1, 2, 'company', 'index'),
+(1, 2, 'bug', 'customFields'),
+(1, 2, 'doc', 'view'),
 (1, 2, 'file', 'edit'),
-(1, 2, 'product', 'index'),
-(1, 2, 'task', 'create'),
-(1, 2, 'user', 'todo'),
-(1, 3, 'search', 'saveQuery'),
-(1, 2, 'report', 'bugSummary'),
-(1, 2, 'testtask', 'view'),
-(1, 2, 'search', 'saveQuery'),
-(1, 3, 'testtask', 'cases'),
+(1, 2, 'testcase', 'export'),
+(1, 2, 'user', 'profile'),
+(1, 2, 'my', 'editProfile'),
+(1, 2, 'report', 'projectDeviation'),
+(1, 2, 'doc', 'editLib'),
+(1, 2, 'bug', 'create'),
+(1, 2, 'my', 'bug'),
+(1, 2, 'my', 'project'),
+(1, 2, 'task', 'activate'),
+(1, 2, 'product', 'doc'),
+(1, 2, 'bug', 'index'),
+(1, 2, 'testtask', 'cases'),
+(1, 3, 'testcase', 'delete'),
+(1, 2, 'product', 'project'),
+(1, 2, 'my', 'changePassword'),
+(1, 2, 'project', 'build'),
 (1, 3, 'project', 'team'),
-(1, 3, 'user', 'todo'),
-(1, 3, 'testtask', 'batchRun'),
-(1, 3, 'my', 'story'),
-(1, 3, 'group', 'browse'),
-(1, 3, 'my', 'changePassword'),
-(1, 3, 'report', 'workload'),
-(1, 3, 'testcase', 'batchEdit'),
-(1, 9, 'my', 'index'),
-(1, 3, 'project', 'browse'),
-(1, 3, 'story', 'tasks'),
-(1, 3, 'productplan', 'view'),
-(1, 3, 'bug', 'browse'),
-(1, 3, 'user', 'task'),
-(1, 3, 'testcase', 'export'),
-(1, 3, 'my', 'dynamic'),
-(1, 9, 'my', 'testTask'),
-(1, 3, 'project', 'bug'),
-(1, 3, 'productplan', 'browse'),
-(1, 3, 'search', 'select'),
-(1, 9, 'my', 'todo'),
-(1, 3, 'doc', 'editLib'),
-(1, 3, 'bug', 'customFields'),
-(1, 3, 'testcase', 'browse'),
-(1, 3, 'search', 'deleteQuery'),
-(1, 3, 'product', 'index'),
-(1, 3, 'project', 'doc'),
-(1, 3, 'project', 'burn'),
-(1, 3, 'my', 'profile'),
-(1, 3, 'tree', 'updateOrder'),
-(1, 3, 'bug', 'resolve'),
-(1, 3, 'project', 'grouptask'),
-(1, 3, 'bug', 'index'),
-(1, 3, 'doc', 'delete'),
-(1, 9, 'my', 'profile'),
-(1, 3, 'bug', 'export'),
-(1, 3, 'report', 'index'),
-(1, 3, 'my', 'index'),
-(1, 3, 'task', 'view'),
-(1, 3, 'my', 'todo'),
-(1, 3, 'my', 'project'),
-(1, 3, 'testtask', 'results'),
-(1, 3, 'report', 'bugSummary'),
-(1, 3, 'story', 'view'),
-(1, 3, 'project', 'view'),
-(1, 3, 'project', 'testtask'),
-(1, 9, 'my', 'story'),
 (1, 3, 'tree', 'delete'),
-(1, 3, 'bug', 'delete'),
-(1, 3, 'product', 'dynamic'),
-(1, 3, 'todo', 'edit'),
-(1, 3, 'project', 'dynamic'),
-(1, 3, 'user', 'view'),
+(1, 3, 'product', 'project'),
+(1, 3, 'project', 'testtask'),
+(1, 3, 'testcase', 'batchEdit'),
+(1, 3, 'task', 'deleteEstimate'),
+(1, 3, 'testtask', 'create'),
+(1, 3, 'task', 'export'),
+(1, 3, 'project', 'task'),
+(1, 9, 'doc', 'createLib'),
+(1, 3, 'bug', 'confirmBug'),
+(1, 3, 'task', 'delete'),
+(1, 3, 'bug', 'create'),
 (1, 3, 'testtask', 'runcase'),
-(1, 3, 'testtask', 'delete'),
+(1, 3, 'product', 'dynamic'),
 (1, 3, 'project', 'index'),
-(1, 3, 'doc', 'browse'),
-(1, 3, 'svn', 'diff'),
-(1, 3, 'tree', 'browse'),
-(1, 3, 'tree', 'manageChild'),
-(1, 3, 'build', 'view'),
-(1, 3, 'doc', 'deleteLib'),
-(1, 3, 'doc', 'create'),
-(1, 3, 'testcase', 'index'),
-(1, 3, 'user', 'project'),
-(1, 3, 'my', 'bug'),
-(1, 3, 'report', 'projectDeviation'),
-(1, 3, 'todo', 'batchCreate'),
-(1, 3, 'doc', 'edit'),
+(1, 3, 'task', 'report'),
+(1, 9, 'testtask', 'browse'),
+(1, 3, 'report', 'bugSummary'),
 (1, 3, 'my', 'editProfile'),
+(1, 3, 'task', 'assignTo'),
+(1, 9, 'testtask', 'index'),
+(1, 3, 'testtask', 'index'),
+(1, 3, 'testtask', 'unlinkcase'),
+(1, 3, 'misc', 'ping'),
+(1, 3, 'testcase', 'view'),
+(1, 3, 'my', 'dynamic'),
+(1, 3, 'bug', 'index'),
+(1, 3, 'bug', 'view'),
+(1, 3, 'testcase', 'create'),
+(1, 3, 'company', 'browse'),
+(1, 3, 'webapp', 'obtain'),
+(1, 3, 'todo', 'create'),
+(1, 3, 'my', 'testTask'),
+(1, 3, 'my', 'task'),
+(1, 9, 'doc', 'browse'),
+(1, 3, 'my', 'testCase'),
+(1, 3, 'testcase', 'confirmStoryChange'),
+(1, 3, 'testcase', 'export'),
+(1, 3, 'project', 'view'),
+(1, 3, 'bug', 'batchEdit'),
+(1, 3, 'testcase', 'browse'),
+(1, 3, 'story', 'tasks'),
+(1, 3, 'testcase', 'batchCreate'),
+(1, 3, 'task', 'view'),
+(1, 3, 'testcase', 'edit'),
+(1, 3, 'task', 'confirmStoryChange'),
+(1, 9, 'testtask', 'linkcase'),
+(1, 3, 'user', 'bug'),
+(1, 3, 'doc', 'editLib'),
+(1, 3, 'report', 'workload'),
+(1, 3, 'todo', 'import2Today'),
+(1, 3, 'task', 'recordEstimate'),
+(1, 3, 'user', 'task'),
+(1, 3, 'productplan', 'view'),
+(1, 3, 'task', 'batchCreate'),
+(1, 3, 'my', 'changePassword'),
+(1, 3, 'my', 'bug'),
+(1, 3, 'tree', 'updateOrder'),
+(1, 3, 'todo', 'view'),
+(1, 3, 'user', 'project'),
 (1, 3, 'search', 'buildQuery'),
-(1, 3, 'project', 'story'),
-(1, 4, 'misc', 'ping'),
-(1, 4, 'file', 'ajaxUpload'),
-(1, 4, 'file', 'delete'),
-(1, 4, 'file', 'edit'),
-(1, 4, 'file', 'download'),
-(1, 4, 'tree', 'fix'),
-(1, 4, 'tree', 'ajaxGetSonModules'),
-(1, 4, 'tree', 'ajaxGetOptionMenu'),
-(1, 4, 'tree', 'delete'),
-(1, 4, 'tree', 'edit'),
-(1, 4, 'tree', 'manageChild'),
-(1, 4, 'tree', 'updateOrder'),
-(1, 4, 'tree', 'browse'),
-(1, 4, 'search', 'select'),
-(1, 4, 'search', 'deleteQuery'),
-(1, 4, 'search', 'saveQuery'),
-(1, 4, 'search', 'buildQuery'),
-(1, 4, 'search', 'buildForm'),
-(1, 4, 'svn', 'apiSync'),
-(1, 4, 'svn', 'cat'),
-(1, 4, 'svn', 'diff'),
-(1, 4, 'action', 'undelete'),
-(1, 4, 'action', 'trash'),
-(1, 4, 'user', 'ajaxGetUser'),
+(1, 3, 'my', 'project'),
+(1, 3, 'report', 'projectDeviation'),
+(1, 3, 'search', 'saveQuery'),
+(1, 3, 'company', 'index'),
+(1, 3, 'testtask', 'linkcase'),
+(1, 3, 'project', 'burn'),
+(1, 3, 'productplan', 'browse'),
+(1, 3, 'user', 'dynamic'),
+(1, 3, 'testtask', 'cases'),
+(1, 3, 'task', 'close'),
+(1, 3, 'report', 'productInfo'),
+(1, 4, 'user', 'view'),
 (1, 4, 'user', 'profile'),
 (1, 4, 'user', 'dynamic'),
-(1, 4, 'user', 'project'),
 (1, 4, 'user', 'bug'),
+(1, 4, 'user', 'project'),
+(1, 4, 'my', 'editProfile'),
+(1, 4, 'todo', 'edit'),
+(1, 4, 'todo', 'view'),
+(1, 4, 'todo', 'create'),
+(1, 4, 'my', 'changePassword'),
+(1, 4, 'my', 'dynamic'),
+(1, 4, 'my', 'profile'),
+(1, 4, 'todo', 'batchCreate'),
+(1, 4, 'task', 'batchEdit'),
+(1, 4, 'task', 'assignTo'),
+(1, 4, 'task', 'edit'),
+(1, 4, 'task', 'start'),
+(1, 4, 'task', 'finish'),
+(1, 4, 'project', 'dynamic'),
+(1, 4, 'project', 'doc'),
+(1, 4, 'project', 'team'),
+(1, 7, 'webapp', 'view'),
+(1, 9, 'webapp', 'index'),
+(1, 4, 'my', 'project'),
+(1, 4, 'my', 'testTask'),
+(1, 4, 'my', 'testCase'),
+(1, 4, 'my', 'bug'),
+(1, 4, 'my', 'story'),
+(1, 4, 'my', 'task'),
+(1, 4, 'my', 'todo'),
+(1, 4, 'my', 'index'),
 (1, 4, 'user', 'task'),
-(1, 4, 'user', 'todo'),
-(1, 4, 'user', 'view'),
-(1, 4, 'group', 'browse'),
-(1, 4, 'company', 'dynamic'),
-(1, 4, 'company', 'browse'),
-(1, 4, 'company', 'index'),
-(1, 4, 'report', 'workload'),
-(1, 4, 'report', 'bugSummary'),
-(1, 4, 'report', 'productInfo'),
-(1, 4, 'report', 'projectDeviation'),
-(1, 4, 'report', 'index'),
-(1, 4, 'doc', 'edit'),
-(1, 4, 'doc', 'view'),
-(1, 4, 'doc', 'create'),
-(1, 4, 'doc', 'editLib'),
-(1, 4, 'doc', 'createLib'),
-(1, 4, 'doc', 'browse'),
-(1, 4, 'doc', 'index'),
-(1, 4, 'testtask', 'results'),
-(1, 4, 'testtask', 'edit'),
-(1, 4, 'testtask', 'cases'),
-(1, 4, 'testtask', 'view'),
-(1, 4, 'testtask', 'browse'),
-(1, 4, 'testtask', 'create'),
-(1, 4, 'testtask', 'index'),
-(1, 4, 'testcase', 'confirmStoryChange'),
-(1, 4, 'testcase', 'export'),
-(1, 4, 'testcase', 'delete'),
-(1, 4, 'testcase', 'edit'),
-(1, 4, 'testcase', 'view'),
-(1, 4, 'testcase', 'batchCreate'),
-(1, 4, 'testcase', 'create'),
+(1, 4, 'search', 'deleteQuery'),
+(1, 4, 'search', 'select'),
+(1, 4, 'search', 'saveQuery'),
+(1, 4, 'task', 'cancel'),
+(1, 4, 'task', 'delete'),
+(1, 4, 'task', 'batchClose'),
+(1, 4, 'task', 'close'),
+(1, 4, 'task', 'activate'),
+(1, 4, 'svn', 'cat'),
+(1, 4, 'action', 'trash'),
+(1, 4, 'search', 'buildForm'),
+(1, 4, 'svn', 'diff'),
+(1, 4, 'svn', 'apiSync'),
+(1, 4, 'search', 'buildQuery'),
+(1, 4, 'action', 'undelete'),
+(1, 4, 'product', 'dynamic'),
+(1, 4, 'story', 'export'),
+(1, 4, 'story', 'tasks'),
+(1, 4, 'product', 'doc'),
+(1, 4, 'story', 'report'),
+(1, 4, 'story', 'view'),
+(1, 4, 'product', 'project'),
+(1, 4, 'project', 'view'),
+(1, 4, 'release', 'browse'),
+(1, 4, 'release', 'export'),
+(1, 4, 'release', 'view'),
+(1, 4, 'productplan', 'browse'),
+(1, 4, 'project', 'create'),
+(1, 4, 'project', 'index'),
 (1, 1, 'admin', 'index'),
 (1, 1, 'product', 'index'),
 (1, 1, 'user', 'create'),
-(1, 5, 'project', 'build'),
-(1, 5, 'company', 'index'),
-(1, 2, 'story', 'export'),
-(1, 2, 'release', 'view'),
-(1, 2, 'misc', 'ping'),
-(1, 3, 'bug', 'batchEdit'),
-(1, 3, 'tree', 'fix'),
-(1, 3, 'testtask', 'view'),
-(1, 4, 'testcase', 'browse'),
-(1, 4, 'testcase', 'index'),
+(1, 5, 'qa', 'index'),
+(1, 5, 'svn', 'apiSync'),
+(1, 2, 'project', 'grouptask'),
+(1, 2, 'productplan', 'browse'),
+(1, 2, 'user', 'todo'),
+(1, 3, 'task', 'create'),
+(1, 3, 'user', 'view'),
+(1, 3, 'release', 'view'),
+(1, 4, 'project', 'browse'),
+(1, 4, 'productplan', 'view'),
 (1, 1, 'extension', 'install'),
 (1, 1, 'task', 'activate'),
 (1, 1, 'story', 'batchCreate'),
-(1, 5, 'user', 'task'),
-(1, 3, 'user', 'profile'),
-(1, 2, 'company', 'dynamic'),
-(1, 3, 'testtask', 'index'),
-(1, 4, 'bug', 'ajaxGetModuleOwner'),
-(1, 4, 'bug', 'ajaxGetUserBugs'),
-(1, 4, 'bug', 'customFields'),
+(1, 5, 'my', 'task'),
+(1, 3, 'product', 'roadmap'),
+(1, 2, 'my', 'story'),
+(1, 3, 'product', 'view'),
+(1, 7, 'webapp', 'index'),
+(1, 6, 'webapp', 'view'),
+(1, 4, 'webapp', 'view'),
 (1, 1, 'bug', 'close'),
 (1, 1, 'bug', 'delete'),
 (1, 1, 'tree', 'edit'),
@@ -1181,134 +1168,121 @@ INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
 (1, 1, 'bug', 'customFields'),
 (1, 1, 'bug', 'index'),
 (1, 1, 'testcase', 'delete'),
-(1, 5, 'user', 'profile'),
-(1, 5, 'product', 'dynamic'),
-(1, 5, 'search', 'buildForm'),
-(1, 5, 'my', 'editProfile'),
-(1, 7, 'my', 'task'),
-(1, 5, 'product', 'order'),
-(1, 5, 'release', 'edit'),
-(1, 7, 'index', 'index'),
-(1, 5, 'my', 'story'),
-(1, 2, 'report', 'productInfo'),
-(1, 3, 'tree', 'edit'),
-(1, 2, 'task', 'activate'),
-(1, 2, 'task', 'close'),
+(1, 5, 'my', 'testTask'),
+(1, 5, 'testcase', 'export'),
+(1, 5, 'release', 'create'),
+(1, 5, 'doc', 'delete'),
+(1, 7, 'doc', 'editLib'),
+(1, 5, 'testcase', 'index'),
+(1, 5, 'project', 'task'),
+(1, 7, 'report', 'workload'),
+(1, 5, 'doc', 'deleteLib'),
 (1, 2, 'project', 'bug'),
-(1, 2, 'product', 'project'),
-(1, 2, 'project', 'burnData'),
-(1, 2, 'task', 'editEstimate'),
-(1, 2, 'doc', 'create'),
-(1, 2, 'my', 'profile'),
-(1, 2, 'task', 'export'),
-(1, 3, 'doc', 'index'),
-(1, 3, 'todo', 'export'),
-(1, 3, 'project', 'build'),
-(1, 9, 'index', 'index'),
-(1, 3, 'file', 'edit'),
-(1, 3, 'testcase', 'confirmStoryChange'),
-(1, 3, 'product', 'browse'),
-(1, 3, 'todo', 'create'),
 (1, 3, 'company', 'dynamic'),
-(1, 3, 'search', 'buildForm'),
-(1, 3, 'bug', 'view'),
+(1, 2, 'bug', 'export'),
+(1, 2, 'bug', 'saveTemplate'),
+(1, 2, 'search', 'select'),
+(1, 2, 'product', 'view'),
+(1, 2, 'api', 'getModel'),
+(1, 2, 'my', 'profile'),
+(1, 2, 'user', 'task'),
+(1, 2, 'bug', 'deleteTemplate'),
+(1, 3, 'testtask', 'batchAssign'),
+(1, 3, 'todo', 'delete'),
+(1, 3, 'my', 'index'),
+(1, 9, 'doc', 'delete'),
 (1, 3, 'bug', 'confirmStoryChange'),
-(1, 4, 'bug', 'deleteTemplate'),
-(1, 4, 'bug', 'saveTemplate'),
-(1, 4, 'bug', 'export'),
-(1, 4, 'bug', 'report'),
-(1, 4, 'bug', 'close'),
-(1, 4, 'bug', 'activate'),
-(1, 4, 'bug', 'resolve'),
-(1, 4, 'bug', 'edit'),
-(1, 4, 'bug', 'view'),
-(1, 4, 'bug', 'confirmBug'),
-(1, 4, 'bug', 'create'),
-(1, 4, 'bug', 'browse'),
-(1, 4, 'bug', 'index'),
-(1, 4, 'qa', 'index'),
+(1, 3, 'project', 'build'),
+(1, 3, 'testcase', 'index'),
+(1, 3, 'todo', 'finish'),
+(1, 3, 'user', 'profile'),
+(1, 3, 'project', 'dynamic'),
+(1, 3, 'tree', 'browse'),
+(1, 3, 'doc', 'index'),
+(1, 4, 'webapp', 'obtain'),
+(1, 4, 'tree', 'delete'),
+(1, 4, 'misc', 'ping'),
+(1, 4, 'file', 'edit'),
+(1, 5, 'webapp', 'view'),
+(1, 7, 'webapp', 'obtain'),
+(1, 4, 'file', 'download'),
+(1, 4, 'webapp', 'index'),
+(1, 4, 'tree', 'fix'),
+(1, 5, 'webapp', 'obtain'),
+(1, 5, 'webapp', 'index'),
+(1, 6, 'webapp', 'obtain'),
+(1, 4, 'file', 'delete'),
+(1, 4, 'task', 'editEstimate'),
 (1, 1, 'bug', 'export'),
 (1, 1, 'project', 'story'),
-(1, 5, 'todo', 'finish'),
-(1, 2, 'task', 'delete'),
-(1, 2, 'my', 'dynamic'),
-(1, 2, 'todo', 'view'),
-(1, 2, 'my', 'story'),
-(1, 3, 'task', 'export'),
-(1, 4, 'build', 'edit'),
-(1, 4, 'task', 'recordEstimate'),
-(1, 4, 'task', 'editEstimate'),
-(1, 4, 'task', 'deleteEstimate'),
-(1, 4, 'project', 'suspend'),
-(1, 4, 'build', 'delete'),
-(1, 4, 'project', 'browse'),
-(1, 11, 'testtask', 'view'),
-(1, 11, 'bug', 'view'),
-(1, 11, 'project', 'view'),
-(1, 11, 'doc', 'browse'),
-(1, 11, 'bug', 'report'),
-(1, 11, 'project', 'grouptask'),
-(1, 11, 'project', 'task'),
-(1, 11, 'testtask', 'browse'),
-(1, 11, 'build', 'view'),
-(1, 11, 'user', 'ajaxGetUser'),
-(1, 11, 'bug', 'browse'),
-(1, 11, 'project', 'index'),
-(1, 11, 'project', 'story'),
-(1, 11, 'product', 'doc'),
-(1, 11, 'user', 'project'),
-(1, 11, 'project', 'burn'),
-(1, 11, 'task', 'view'),
-(1, 11, 'user', 'task'),
-(1, 11, 'project', 'build'),
-(1, 11, 'project', 'bug'),
-(1, 11, 'product', 'index'),
-(1, 11, 'project', 'testtask'),
-(1, 11, 'project', 'doc'),
-(1, 11, 'product', 'roadmap'),
-(1, 11, 'product', 'browse'),
-(1, 11, 'search', 'buildForm'),
-(1, 11, 'product', 'dynamic'),
-(1, 11, 'product', 'view'),
-(1, 11, 'build', 'ajaxGetProductBuilds'),
-(1, 11, 'qa', 'index'),
-(1, 11, 'release', 'view'),
-(1, 11, 'testtask', 'index'),
-(1, 11, 'bug', 'ajaxGetUserBugs'),
-(1, 11, 'testcase', 'browse'),
-(1, 11, 'task', 'ajaxGetProjectTasks'),
-(1, 11, 'build', 'ajaxGetProjectBuilds'),
-(1, 11, 'project', 'ajaxGetProducts'),
-(1, 11, 'testcase', 'view'),
-(1, 11, 'bug', 'ajaxGetModuleOwner'),
-(1, 11, 'company', 'browse'),
-(1, 11, 'company', 'dynamic'),
-(1, 11, 'user', 'profile'),
-(1, 11, 'user', 'dynamic'),
-(1, 11, 'task', 'ajaxGetUserTasks'),
-(1, 11, 'project', 'team'),
-(1, 11, 'project', 'dynamic'),
-(1, 11, 'story', 'view'),
-(1, 11, 'bug', 'index'),
-(1, 11, 'story', 'ajaxGetProjectStories'),
-(1, 11, 'doc', 'index'),
-(1, 11, 'product', 'ajaxGetPlans'),
-(1, 11, 'index', 'index'),
-(1, 11, 'testtask', 'results'),
-(1, 11, 'testcase', 'index'),
-(1, 11, 'group', 'browse'),
-(1, 11, 'story', 'tasks'),
+(1, 5, 'todo', 'view'),
+(1, 2, 'task', 'confirmStoryChange'),
+(1, 2, 'user', 'bug'),
+(1, 2, 'doc', 'create'),
+(1, 2, 'company', 'browse'),
+(1, 3, 'release', 'export'),
+(1, 4, 'tree', 'updateOrder'),
+(1, 4, 'project', 'putoff'),
+(1, 4, 'project', 'order'),
+(1, 4, 'project', 'task'),
+(1, 4, 'build', 'view'),
+(1, 4, 'tree', 'manageChild'),
+(1, 4, 'testcase', 'export'),
 (1, 11, 'productplan', 'browse'),
-(1, 11, 'story', 'ajaxGetProductStories'),
-(1, 11, 'productplan', 'view'),
-(1, 11, 'search', 'buildQuery'),
-(1, 11, 'file', 'download'),
-(1, 11, 'user', 'bug'),
-(1, 11, 'release', 'browse'),
-(1, 11, 'company', 'index'),
-(1, 11, 'user', 'todo'),
+(1, 11, 'bug', 'browse'),
+(1, 11, 'webapp', 'view'),
+(1, 11, 'testtask', 'index'),
+(1, 11, 'testcase', 'index'),
+(1, 11, 'project', 'index'),
+(1, 11, 'story', 'tasks'),
+(1, 11, 'testcase', 'view'),
+(1, 11, 'testcase', 'browse'),
+(1, 11, 'user', 'task'),
+(1, 11, 'product', 'roadmap'),
+(1, 11, 'testtask', 'cases'),
+(1, 11, 'project', 'grouptask'),
+(1, 11, 'product', 'view'),
+(1, 11, 'testtask', 'results'),
+(1, 11, 'doc', 'index'),
 (1, 11, 'user', 'view'),
+(1, 11, 'bug', 'view'),
+(1, 11, 'testtask', 'view'),
+(1, 11, 'group', 'browse'),
+(1, 11, 'user', 'bug'),
+(1, 11, 'project', 'dynamic'),
+(1, 11, 'user', 'todo'),
+(1, 11, 'company', 'dynamic'),
+(1, 11, 'bug', 'index'),
+(1, 11, 'task', 'view'),
+(1, 11, 'release', 'browse'),
+(1, 11, 'project', 'task'),
+(1, 11, 'project', 'build'),
+(1, 11, 'doc', 'view'),
+(1, 11, 'project', 'view'),
+(1, 11, 'product', 'doc'),
+(1, 11, 'product', 'dynamic'),
+(1, 11, 'project', 'story'),
+(1, 11, 'bug', 'report'),
+(1, 11, 'testtask', 'browse'),
+(1, 11, 'project', 'testtask'),
+(1, 11, 'project', 'burn'),
+(1, 11, 'webapp', 'obtain'),
+(1, 11, 'user', 'dynamic'),
+(1, 11, 'search', 'buildForm'),
+(1, 11, 'productplan', 'view'),
 (1, 11, 'project', 'browse'),
+(1, 11, 'search', 'buildQuery'),
+(1, 11, 'project', 'bug'),
+(1, 11, 'company', 'browse'),
+(1, 11, 'project', 'team'),
+(1, 11, 'company', 'index'),
+(1, 11, 'project', 'doc'),
+(1, 11, 'file', 'download'),
+(1, 11, 'story', 'view'),
+(1, 11, 'build', 'view'),
+(1, 11, 'product', 'browse'),
+(1, 11, 'product', 'index'),
+(1, 11, 'doc', 'browse'),
 (1, 1, 'company', 'index'),
 (1, 1, 'project', 'activate'),
 (1, 1, 'file', 'delete'),
@@ -1331,30 +1305,30 @@ INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
 (1, 1, 'release', 'edit'),
 (1, 1, 'bug', 'batchEdit'),
 (1, 1, 'testcase', 'edit'),
-(1, 5, 'project', 'story'),
-(1, 7, 'my', 'project'),
-(1, 5, 'svn', 'diff'),
-(1, 5, 'search', 'buildQuery'),
-(1, 5, 'my', 'testCase'),
-(1, 2, 'file', 'delete'),
-(1, 2, 'testtask', 'browse'),
-(1, 7, 'story', 'tasks'),
+(1, 5, 'project', 'doc'),
+(1, 7, 'doc', 'create'),
+(1, 5, 'story', 'batchCreate'),
+(1, 5, 'release', 'browse'),
 (1, 5, 'doc', 'createLib'),
-(1, 3, 'todo', 'import2Today'),
-(1, 9, 'my', 'testCase'),
-(1, 3, 'testtask', 'batchAssign'),
-(1, 4, 'build', 'create'),
-(1, 4, 'task', 'confirmStoryChange'),
-(1, 4, 'task', 'batchCreate'),
-(1, 4, 'task', 'create'),
-(1, 4, 'project', 'computeBurn'),
-(1, 4, 'task', 'edit'),
-(1, 11, 'product', 'ajaxGetProjects'),
+(1, 2, 'task', 'close'),
+(1, 2, 'testtask', 'view'),
+(1, 7, 'story', 'view'),
+(1, 5, 'user', 'profile'),
+(1, 3, 'todo', 'export'),
+(1, 9, 'testtask', 'view'),
+(1, 3, 'search', 'select'),
+(1, 4, 'tree', 'edit'),
+(1, 4, 'project', 'importBug'),
+(1, 4, 'project', 'bug'),
+(1, 4, 'project', 'importtask'),
+(1, 4, 'testcase', 'browse'),
+(1, 4, 'project', 'delete'),
+(1, 11, 'user', 'project'),
 (1, 1, 'bug', 'confirmStoryChange'),
-(1, 5, 'bug', 'browse'),
-(1, 2, 'project', 'team'),
-(1, 3, 'testtask', 'create'),
-(1, 4, 'project', 'linkStory'),
+(1, 5, 'file', 'delete'),
+(1, 2, 'story', 'view'),
+(1, 3, 'task', 'edit'),
+(1, 4, 'bug', 'edit'),
 (1, 1, 'productplan', 'unlinkStory'),
 (1, 1, 'productplan', 'browse'),
 (1, 1, 'story', 'batchEdit'),
@@ -1365,72 +1339,71 @@ INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
 (1, 1, 'project', 'manageMembers'),
 (1, 1, 'testtask', 'linkcase'),
 (1, 1, 'project', 'manageProducts'),
-(1, 5, 'story', 'review'),
-(1, 5, 'product', 'doc'),
-(1, 5, 'doc', 'editLib'),
-(1, 5, 'project', 'manageProducts'),
-(1, 7, 'my', 'index'),
-(1, 7, 'todo', 'finish'),
-(1, 2, 'user', 'profile'),
-(1, 9, 'my', 'project'),
-(1, 3, 'file', 'download'),
-(1, 9, 'my', 'editProfile'),
-(1, 3, 'project', 'task'),
-(1, 3, 'bug', 'report'),
-(1, 3, 'todo', 'finish'),
-(1, 3, 'user', 'dynamic'),
-(1, 4, 'task', 'report'),
-(1, 4, 'project', 'burnData'),
+(1, 5, 'story', 'change'),
+(1, 5, 'testtask', 'index'),
+(1, 5, 'user', 'task'),
+(1, 5, 'project', 'dynamic'),
+(1, 7, 'doc', 'edit'),
+(1, 7, 'todo', 'view'),
+(1, 2, 'doc', 'index'),
+(1, 9, 'doc', 'index'),
+(1, 3, 'testtask', 'delete'),
+(1, 9, 'doc', 'editLib'),
+(1, 3, 'bug', 'browse'),
+(1, 3, 'svn', 'apiSync'),
+(1, 3, 'product', 'browse'),
+(1, 3, 'product', 'doc'),
+(1, 4, 'project', 'activate'),
+(1, 4, 'testcase', 'batchCreate'),
+(1, 4, 'testcase', 'view'),
 (1, 4, 'project', 'burn'),
-(1, 4, 'task', 'batchClose'),
-(1, 4, 'project', 'dynamic'),
-(1, 4, 'task', 'cancel'),
-(1, 4, 'project', 'story'),
-(1, 4, 'task', 'batchEdit'),
-(1, 4, 'project', 'team'),
-(1, 11, 'doc', 'view'),
-(1, 11, 'testtask', 'cases'),
+(1, 4, 'bug', 'saveTemplate'),
+(1, 4, 'project', 'build'),
+(1, 4, 'qa', 'index'),
+(1, 4, 'project', 'testtask'),
+(1, 4, 'build', 'edit'),
+(1, 11, 'webapp', 'index'),
+(1, 11, 'release', 'view'),
 (1, 1, 'testtask', 'cases'),
 (1, 1, 'testcase', 'index'),
 (1, 1, 'task', 'batchEdit'),
 (1, 1, 'testcase', 'confirmStoryChange'),
 (1, 1, 'doc', 'edit'),
-(1, 5, 'story', 'view'),
-(1, 5, 'story', 'edit'),
-(1, 5, 'story', 'change'),
-(1, 5, 'task', 'export'),
-(1, 2, 'todo', 'create'),
-(1, 2, 'productplan', 'view'),
-(1, 2, 'story', 'report'),
-(1, 3, 'index', 'index'),
-(1, 3, 'doc', 'createLib'),
-(1, 9, 'my', 'bug'),
-(1, 3, 'todo', 'batchEdit'),
-(1, 4, 'task', 'finish'),
-(1, 4, 'project', 'doc'),
-(1, 11, 'file', 'ajaxUpload'),
+(1, 5, 'story', 'delete'),
+(1, 5, 'story', 'batchClose'),
+(1, 5, 'story', 'batchEdit'),
+(1, 5, 'story', 'create'),
+(1, 2, 'my', 'dynamic'),
+(1, 2, 'file', 'download'),
+(1, 2, 'project', 'index'),
+(1, 3, 'qa', 'index'),
+(1, 3, 'svn', 'diff'),
+(1, 9, 'doc', 'view'),
+(1, 3, 'product', 'index'),
+(1, 4, 'project', 'suspend'),
+(1, 4, 'bug', 'deleteTemplate'),
 (1, 11, 'misc', 'ping'),
-(1, 5, 'project', 'dynamic'),
-(1, 2, 'product', 'view'),
-(1, 3, 'bug', 'assignTo'),
-(1, 11, 'release', 'ajaxGetStoriesAndBugs'),
+(1, 11, 'user', 'profile'),
+(1, 5, 'task', 'export'),
+(1, 2, 'product', 'roadmap'),
+(1, 3, 'task', 'finish'),
+(1, 11, 'qa', 'index'),
 (1, 1, 'dept', 'delete'),
 (1, 1, 'task', 'edit'),
 (1, 1, 'task', 'assignTo'),
 (1, 1, 'group', 'edit'),
-(1, 1, 'task', 'deleteEstimate'),
-(1, 2, 'my', 'changePassword'),
+(1, 2, 'company', 'index'),
 (1, 1, 'product', 'close'),
-(1, 5, 'todo', 'create'),
-(1, 2, 'project', 'task'),
-(1, 9, 'my', 'task'),
+(1, 5, 'todo', 'import2Today'),
+(1, 2, 'svn', 'cat'),
+(1, 9, 'testtask', 'cases'),
 (1, 1, 'doc', 'deleteLib'),
-(1, 5, 'release', 'create'),
+(1, 5, 'project', 'story'),
 (1, 1, 'report', 'bugSummary'),
-(1, 5, 'project', 'task'),
-(1, 3, 'my', 'task'),
-(1, 1, 'user', 'view'),
 (1, 5, 'project', 'team'),
+(1, 3, 'bug', 'saveTemplate'),
+(1, 1, 'user', 'view'),
+(1, 5, 'project', 'burnData'),
 (1, 1, 'project', 'edit'),
 (1, 1, 'user', 'batchCreate'),
 (1, 1, 'user', 'profile'),
@@ -1445,468 +1418,467 @@ INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
 (1, 1, 'tree', 'updateOrder'),
 (1, 1, 'task', 'confirmStoryChange'),
 (1, 1, 'action', 'hideOne'),
-(1, 5, 'bug', 'deleteTemplate'),
-(1, 5, 'todo', 'batchCreate'),
-(1, 3, 'my', 'testTask'),
-(1, 5, 'doc', 'browse'),
-(1, 2, 'todo', 'batchCreate'),
-(1, 3, 'svn', 'cat'),
-(1, 2, 'bug', 'browse'),
-(1, 3, 'testtask', 'unlinkcase'),
-(1, 2, 'story', 'view'),
-(1, 4, 'project', 'manageProducts'),
-(1, 5, 'file', 'download'),
-(1, 3, 'release', 'view'),
-(1, 2, 'my', 'editProfile'),
-(1, 3, 'story', 'export'),
-(1, 5, 'project', 'bug'),
-(1, 5, 'story', 'tasks'),
-(1, 5, 'bug', 'customFields'),
-(1, 5, 'bug', 'index'),
-(1, 5, 'misc', 'ping'),
-(1, 5, 'story', 'activate'),
-(1, 5, 'build', 'view'),
-(1, 5, 'bug', 'view'),
-(1, 7, 'my', 'dynamic'),
-(1, 5, 'tree', 'edit'),
-(1, 7, 'my', 'story'),
-(1, 5, 'file', 'edit'),
-(1, 5, 'story', 'create'),
-(1, 5, 'todo', 'export'),
-(1, 5, 'story', 'batchCreate'),
-(1, 5, 'company', 'dynamic'),
 (1, 5, 'tree', 'delete'),
-(1, 5, 'project', 'browse'),
-(1, 5, 'doc', 'index'),
-(1, 5, 'doc', 'view'),
-(1, 5, 'doc', 'create'),
-(1, 5, 'todo', 'delete'),
-(1, 5, 'bug', 'saveTemplate'),
-(1, 5, 'productplan', 'create'),
-(1, 5, 'project', 'testtask'),
-(1, 5, 'testcase', 'view'),
-(1, 5, 'release', 'browse'),
-(1, 5, 'story', 'batchEdit'),
-(1, 5, 'testcase', 'browse'),
-(1, 5, 'testtask', 'results'),
-(1, 5, 'qa', 'index'),
-(1, 5, 'bug', 'edit'),
-(1, 5, 'report', 'index'),
-(1, 5, 'product', 'project'),
-(1, 5, 'story', 'report'),
-(1, 5, 'product', 'view'),
-(1, 5, 'story', 'delete'),
-(1, 5, 'todo', 'import2Today'),
-(1, 5, 'user', 'todo'),
-(1, 5, 'bug', 'report'),
-(1, 5, 'testtask', 'browse'),
-(1, 2, 'bug', 'create'),
-(1, 2, 'task', 'cancel'),
-(1, 2, 'task', 'view'),
-(1, 2, 'testtask', 'index'),
-(1, 2, 'product', 'dynamic'),
-(1, 2, 'task', 'batchCreate'),
-(1, 2, 'report', 'projectDeviation'),
-(1, 2, 'my', 'bug'),
-(1, 2, 'search', 'deleteQuery'),
-(1, 2, 'my', 'project'),
-(1, 2, 'my', 'task'),
-(1, 2, 'my', 'index'),
-(1, 2, 'api', 'getModel'),
-(1, 2, 'index', 'index'),
-(1, 2, 'my', 'todo'),
-(1, 2, 'search', 'select'),
-(1, 2, 'group', 'browse'),
-(1, 7, 'todo', 'batchCreate'),
-(1, 7, 'todo', 'import2Today'),
-(1, 2, 'product', 'browse'),
-(1, 2, 'testcase', 'index'),
-(1, 2, 'project', 'grouptask'),
-(1, 2, 'bug', 'view'),
-(1, 2, 'bug', 'resolve'),
-(1, 2, 'bug', 'edit'),
-(1, 2, 'testcase', 'view'),
-(1, 2, 'doc', 'delete'),
-(1, 2, 'project', 'burn'),
-(1, 2, 'bug', 'saveTemplate'),
-(1, 2, 'bug', 'deleteTemplate'),
-(1, 2, 'bug', 'index'),
-(1, 2, 'testcase', 'export'),
-(1, 2, 'bug', 'export'),
-(1, 2, 'bug', 'report'),
-(1, 2, 'task', 'recordEstimate'),
-(1, 2, 'task', 'editEstimate'),
-(1, 2, 'task', 'deleteEstimate'),
-(1, 2, 'user', 'project'),
-(1, 2, 'svn', 'diff'),
-(1, 2, 'task', 'start'),
-(1, 2, 'task', 'edit'),
-(1, 2, 'project', 'build'),
-(1, 7, 'story', 'batchClose'),
-(1, 7, 'todo', 'view'),
-(1, 7, 'todo', 'edit'),
-(1, 2, 'project', 'index'),
-(1, 2, 'project', 'doc'),
-(1, 3, 'qa', 'index'),
-(1, 3, 'task', 'report'),
-(1, 3, 'user', 'bug'),
-(1, 3, 'bug', 'close'),
-(1, 3, 'testcase', 'delete'),
-(1, 3, 'bug', 'activate'),
-(1, 3, 'story', 'report'),
-(1, 3, 'release', 'browse'),
-(1, 3, 'release', 'export'),
-(1, 3, 'bug', 'saveTemplate'),
-(1, 3, 'todo', 'view'),
-(1, 3, 'testtask', 'linkcase'),
-(1, 3, 'doc', 'view'),
-(1, 3, 'product', 'view'),
-(1, 3, 'product', 'doc'),
-(1, 3, 'product', 'roadmap'),
-(1, 3, 'product', 'project'),
-(1, 3, 'report', 'productInfo'),
-(1, 3, 'company', 'browse'),
-(1, 3, 'bug', 'edit'),
-(1, 3, 'bug', 'create'),
-(1, 3, 'bug', 'confirmBug'),
-(1, 3, 'company', 'index'),
-(1, 3, 'project', 'burnData'),
-(1, 3, 'svn', 'apiSync'),
-(1, 3, 'my', 'testCase'),
-(1, 3, 'file', 'delete'),
+(1, 5, 'product', 'index'),
 (1, 3, 'bug', 'deleteTemplate'),
-(1, 9, 'my', 'dynamic'),
-(1, 3, 'testtask', 'edit'),
-(1, 3, 'todo', 'delete'),
-(1, 3, 'testcase', 'edit'),
-(1, 3, 'testcase', 'batchCreate'),
-(1, 3, 'testcase', 'view'),
-(1, 3, 'testcase', 'create'),
-(1, 4, 'project', 'edit'),
-(1, 4, 'project', 'manageMembers'),
-(1, 4, 'project', 'testtask'),
-(1, 4, 'task', 'assignTo'),
-(1, 4, 'task', 'start'),
-(1, 4, 'project', 'start'),
-(1, 4, 'project', 'importtask'),
-(1, 4, 'task', 'delete'),
-(1, 4, 'project', 'close'),
-(1, 4, 'project', 'order'),
-(1, 4, 'project', 'grouptask'),
-(1, 4, 'project', 'activate'),
-(1, 4, 'task', 'export'),
-(1, 4, 'project', 'importBug'),
-(1, 4, 'task', 'activate'),
-(1, 4, 'project', 'putoff'),
-(1, 4, 'project', 'unlinkMember'),
-(1, 4, 'project', 'task'),
-(1, 4, 'task', 'close'),
-(1, 4, 'project', 'view'),
-(1, 4, 'project', 'bug'),
-(1, 4, 'project', 'delete'),
-(1, 4, 'project', 'create'),
-(1, 4, 'project', 'index'),
-(1, 4, 'task', 'view'),
-(1, 4, 'project', 'build'),
-(1, 4, 'release', 'export'),
-(1, 4, 'release', 'ajaxGetStoriesAndBugs'),
-(1, 4, 'release', 'view'),
-(1, 4, 'release', 'browse'),
-(1, 4, 'productplan', 'view'),
-(1, 4, 'productplan', 'browse'),
-(1, 4, 'story', 'ajaxGetProductStories'),
-(1, 4, 'story', 'ajaxGetProjectStories'),
-(1, 4, 'story', 'report'),
-(1, 4, 'story', 'tasks'),
-(1, 4, 'story', 'view'),
-(1, 4, 'story', 'export'),
-(1, 4, 'product', 'ajaxGetPlans'),
-(1, 4, 'product', 'ajaxGetProjects'),
-(1, 4, 'product', 'project'),
-(1, 4, 'product', 'dynamic'),
-(1, 4, 'product', 'doc'),
-(1, 4, 'product', 'roadmap'),
-(1, 4, 'product', 'view'),
-(1, 4, 'product', 'browse'),
-(1, 4, 'product', 'index'),
-(1, 4, 'todo', 'import2Today'),
-(1, 4, 'todo', 'finish'),
-(1, 4, 'todo', 'export'),
-(1, 4, 'todo', 'delete'),
-(1, 4, 'todo', 'view'),
-(1, 4, 'todo', 'edit'),
-(1, 4, 'todo', 'create'),
-(1, 4, 'my', 'changePassword'),
-(1, 4, 'my', 'editProfile'),
-(1, 4, 'my', 'dynamic'),
-(1, 4, 'my', 'profile'),
-(1, 4, 'my', 'project'),
-(1, 4, 'my', 'story'),
-(1, 4, 'my', 'testCase'),
-(1, 4, 'my', 'testTask'),
-(1, 4, 'my', 'bug'),
-(1, 4, 'my', 'task'),
-(1, 4, 'my', 'todo'),
-(1, 4, 'my', 'index'),
-(1, 1, 'testtask', 'close'),
-(1, 5, 'story', 'export'),
+(1, 5, 'svn', 'cat'),
+(1, 2, 'todo', 'create'),
+(1, 3, 'project', 'bug'),
+(1, 2, 'doc', 'delete'),
+(1, 3, 'story', 'report'),
+(1, 2, 'bug', 'view'),
+(1, 4, 'bug', 'confirmBug'),
+(1, 5, 'company', 'dynamic'),
+(1, 3, 'project', 'burnData'),
+(1, 2, 'user', 'view'),
+(1, 3, 'task', 'activate'),
+(1, 5, 'bug', 'index'),
+(1, 5, 'story', 'view'),
+(1, 5, 'file', 'download'),
+(1, 5, 'tree', 'manageChild'),
+(1, 5, 'report', 'bugSummary'),
+(1, 5, 'productplan', 'delete'),
+(1, 5, 'search', 'saveQuery'),
+(1, 5, 'search', 'deleteQuery'),
+(1, 7, 'report', 'index'),
+(1, 5, 'my', 'editProfile'),
+(1, 7, 'doc', 'deleteLib'),
+(1, 5, 'company', 'browse'),
+(1, 5, 'story', 'tasks'),
+(1, 5, 'todo', 'delete'),
+(1, 5, 'productplan', 'create'),
+(1, 5, 'search', 'buildForm'),
+(1, 5, 'my', 'changePassword'),
+(1, 5, 'bug', 'browse'),
+(1, 5, 'user', 'todo'),
+(1, 5, 'user', 'view'),
+(1, 5, 'svn', 'diff'),
+(1, 5, 'todo', 'finish'),
+(1, 5, 'search', 'select'),
+(1, 5, 'bug', 'export'),
+(1, 5, 'project', 'burn'),
+(1, 5, 'product', 'delete'),
+(1, 5, 'project', 'build'),
+(1, 5, 'productplan', 'browse'),
+(1, 5, 'product', 'dynamic'),
+(1, 5, 'product', 'create'),
+(1, 5, 'project', 'testtask'),
+(1, 5, 'tree', 'fix'),
+(1, 5, 'release', 'export'),
+(1, 5, 'bug', 'batchEdit'),
+(1, 5, 'story', 'review'),
+(1, 5, 'bug', 'deleteTemplate'),
+(1, 5, 'story', 'activate'),
+(1, 5, 'todo', 'edit'),
+(1, 5, 'my', 'todo'),
+(1, 5, 'tree', 'updateOrder'),
+(1, 5, 'product', 'order'),
+(1, 2, 'report', 'workload'),
+(1, 2, 'build', 'view'),
+(1, 2, 'testcase', 'view'),
 (1, 2, 'todo', 'delete'),
+(1, 2, 'todo', 'batchEdit'),
+(1, 2, 'bug', 'browse'),
+(1, 2, 'project', 'story'),
+(1, 2, 'group', 'browse'),
+(1, 2, 'story', 'export'),
+(1, 2, 'user', 'project'),
+(1, 2, 'todo', 'import2Today'),
+(1, 2, 'company', 'dynamic'),
+(1, 2, 'index', 'index'),
+(1, 2, 'task', 'delete'),
+(1, 2, 'product', 'index'),
+(1, 2, 'release', 'browse'),
+(1, 2, 'task', 'batchClose'),
+(1, 7, 'product', 'index'),
+(1, 7, 'todo', 'edit'),
+(1, 2, 'todo', 'finish'),
+(1, 2, 'testcase', 'browse'),
+(1, 2, 'misc', 'ping'),
+(1, 2, 'project', 'team'),
+(1, 2, 'task', 'finish'),
+(1, 2, 'webapp', 'index'),
+(1, 2, 'testcase', 'index'),
+(1, 2, 'my', 'todo'),
+(1, 2, 'search', 'buildQuery'),
+(1, 2, 'task', 'cancel'),
+(1, 2, 'report', 'bugSummary'),
+(1, 2, 'task', 'start'),
+(1, 2, 'testtask', 'browse'),
+(1, 2, 'task', 'edit'),
+(1, 2, 'task', 'assignTo'),
+(1, 2, 'project', 'dynamic'),
+(1, 2, 'task', 'recordEstimate'),
+(1, 2, 'doc', 'edit'),
+(1, 2, 'bug', 'resolve'),
+(1, 2, 'task', 'batchCreate'),
+(1, 2, 'task', 'export'),
+(1, 2, 'search', 'saveQuery'),
+(1, 7, 'productplan', 'edit'),
+(1, 7, 'todo', 'batchCreate'),
+(1, 7, 'todo', 'export'),
+(1, 2, 'search', 'deleteQuery'),
+(1, 2, 'svn', 'apiSync'),
+(1, 3, 'task', 'batchClose'),
+(1, 3, 'project', 'browse'),
+(1, 3, 'release', 'browse'),
+(1, 3, 'testtask', 'results'),
+(1, 3, 'project', 'story'),
+(1, 3, 'project', 'doc'),
+(1, 3, 'task', 'cancel'),
+(1, 3, 'task', 'start'),
+(1, 3, 'bug', 'customFields'),
+(1, 3, 'webapp', 'index'),
+(1, 3, 'testtask', 'edit'),
+(1, 3, 'story', 'view'),
+(1, 3, 'testtask', 'view'),
+(1, 3, 'my', 'profile'),
+(1, 3, 'bug', 'export'),
+(1, 3, 'task', 'editEstimate'),
+(1, 3, 'todo', 'batchCreate'),
+(1, 3, 'task', 'batchEdit'),
+(1, 3, 'my', 'todo'),
+(1, 3, 'my', 'story'),
+(1, 3, 'testtask', 'batchRun'),
+(1, 3, 'doc', 'edit'),
+(1, 3, 'bug', 'edit'),
+(1, 3, 'doc', 'delete'),
+(1, 3, 'project', 'grouptask'),
+(1, 3, 'bug', 'report'),
 (1, 3, 'testtask', 'browse'),
-(1, 4, 'todo', 'batchCreate'),
-(1, 4, 'index', 'index'),
-(1, 6, 'index', 'index'),
-(1, 6, 'my', 'index'),
-(1, 6, 'my', 'todo'),
-(1, 6, 'my', 'task'),
-(1, 6, 'my', 'bug'),
-(1, 6, 'my', 'story'),
-(1, 6, 'my', 'project'),
-(1, 6, 'my', 'profile'),
-(1, 6, 'my', 'dynamic'),
-(1, 6, 'my', 'editProfile'),
-(1, 6, 'my', 'changePassword'),
-(1, 6, 'todo', 'create'),
-(1, 6, 'todo', 'batchCreate'),
-(1, 6, 'todo', 'edit'),
-(1, 6, 'todo', 'view'),
-(1, 6, 'todo', 'delete'),
-(1, 6, 'todo', 'export'),
-(1, 6, 'todo', 'finish'),
-(1, 6, 'todo', 'import2Today'),
-(1, 6, 'todo', 'batchEdit'),
-(1, 6, 'product', 'index'),
-(1, 6, 'product', 'browse'),
-(1, 6, 'product', 'view'),
-(1, 6, 'product', 'roadmap'),
-(1, 6, 'product', 'doc'),
-(1, 6, 'product', 'dynamic'),
-(1, 6, 'product', 'project'),
-(1, 6, 'story', 'export'),
-(1, 6, 'story', 'view'),
-(1, 6, 'story', 'tasks'),
-(1, 6, 'story', 'report'),
-(1, 6, 'productplan', 'browse'),
-(1, 6, 'productplan', 'view'),
-(1, 6, 'release', 'browse'),
-(1, 6, 'release', 'view'),
-(1, 6, 'release', 'export'),
-(1, 6, 'task', 'finish'),
-(1, 6, 'task', 'batchEdit'),
-(1, 6, 'task', 'report'),
-(1, 6, 'task', 'assignTo'),
-(1, 6, 'task', 'cancel'),
-(1, 6, 'task', 'start'),
-(1, 6, 'task', 'export'),
-(1, 6, 'task', 'confirmStoryChange'),
-(1, 6, 'task', 'view'),
-(1, 6, 'task', 'activate'),
-(1, 6, 'task', 'delete'),
-(1, 6, 'task', 'edit'),
-(1, 6, 'task', 'batchClose'),
-(1, 6, 'task', 'close'),
-(1, 6, 'project', 'bug'),
-(1, 6, 'project', 'doc'),
-(1, 6, 'project', 'team'),
-(1, 6, 'project', 'story'),
-(1, 6, 'task', 'create'),
-(1, 6, 'project', 'view'),
-(1, 6, 'project', 'task'),
-(1, 6, 'project', 'burnData'),
-(1, 6, 'project', 'computeBurn'),
-(1, 6, 'project', 'dynamic'),
-(1, 6, 'task', 'batchCreate'),
-(1, 6, 'project', 'build'),
-(1, 6, 'project', 'index'),
-(1, 6, 'project', 'grouptask'),
-(1, 6, 'project', 'burn'),
-(1, 6, 'project', 'browse'),
-(1, 6, 'task', 'recordEstimate'),
-(1, 6, 'task', 'editEstimate'),
-(1, 6, 'task', 'deleteEstimate'),
-(1, 6, 'qa', 'index'),
-(1, 6, 'bug', 'index'),
-(1, 6, 'bug', 'browse'),
-(1, 6, 'bug', 'create'),
-(1, 6, 'bug', 'view'),
-(1, 6, 'bug', 'edit'),
-(1, 6, 'bug', 'resolve'),
-(1, 6, 'bug', 'report'),
-(1, 6, 'bug', 'export'),
-(1, 6, 'bug', 'saveTemplate'),
-(1, 6, 'bug', 'deleteTemplate'),
-(1, 6, 'bug', 'customFields'),
-(1, 6, 'testcase', 'index'),
-(1, 6, 'testcase', 'browse'),
-(1, 6, 'testcase', 'create'),
-(1, 6, 'testcase', 'batchCreate'),
-(1, 6, 'testcase', 'view'),
-(1, 6, 'testcase', 'edit'),
-(1, 6, 'testcase', 'delete'),
-(1, 6, 'testcase', 'export'),
-(1, 6, 'testcase', 'confirmStoryChange'),
-(1, 6, 'testcase', 'batchEdit'),
-(1, 6, 'testtask', 'index'),
-(1, 6, 'testtask', 'browse'),
-(1, 6, 'testtask', 'view'),
+(1, 3, 'bug', 'activate'),
+(1, 9, 'doc', 'deleteLib'),
+(1, 3, 'svn', 'cat'),
+(1, 3, 'todo', 'edit'),
+(1, 3, 'tree', 'manageChild'),
+(1, 3, 'search', 'buildForm'),
+(1, 3, 'file', 'edit'),
+(1, 3, 'tree', 'edit'),
+(1, 4, 'bug', 'export'),
+(1, 4, 'bug', 'view'),
+(1, 4, 'build', 'create'),
+(1, 4, 'project', 'computeBurn'),
+(1, 4, 'project', 'start'),
+(1, 4, 'bug', 'index'),
+(1, 4, 'bug', 'activate'),
+(1, 4, 'project', 'grouptask'),
+(1, 4, 'testcase', 'create'),
+(1, 4, 'bug', 'create'),
+(1, 4, 'bug', 'report'),
+(1, 4, 'testcase', 'confirmStoryChange'),
+(1, 4, 'project', 'close'),
+(1, 4, 'bug', 'close'),
+(1, 4, 'project', 'burnData'),
+(1, 4, 'bug', 'browse'),
+(1, 4, 'task', 'report'),
+(1, 4, 'build', 'delete'),
+(1, 4, 'project', 'story'),
+(1, 4, 'task', 'deleteEstimate'),
+(1, 4, 'testcase', 'delete'),
+(1, 4, 'bug', 'customFields'),
+(1, 4, 'testcase', 'index'),
+(1, 4, 'bug', 'resolve'),
+(1, 4, 'project', 'edit'),
+(1, 4, 'testcase', 'edit'),
+(1, 4, 'task', 'export'),
+(1, 4, 'task', 'recordEstimate'),
+(1, 4, 'task', 'view'),
+(1, 4, 'task', 'confirmStoryChange'),
+(1, 4, 'testtask', 'index'),
+(1, 4, 'testtask', 'create'),
+(1, 4, 'task', 'batchCreate'),
+(1, 4, 'task', 'create'),
+(1, 4, 'project', 'unlinkMember'),
+(1, 4, 'project', 'manageMembers'),
+(1, 4, 'project', 'manageProducts'),
+(1, 4, 'project', 'linkStory'),
+(1, 4, 'doc', 'editLib'),
+(1, 4, 'doc', 'createLib'),
+(1, 4, 'testtask', 'cases'),
+(1, 4, 'testtask', 'results'),
+(1, 4, 'doc', 'index'),
+(1, 4, 'testtask', 'view'),
+(1, 4, 'testtask', 'browse'),
+(1, 4, 'doc', 'browse'),
+(1, 4, 'testtask', 'edit'),
+(1, 4, 'todo', 'export'),
+(1, 4, 'todo', 'finish'),
+(1, 4, 'todo', 'import2Today'),
+(1, 4, 'product', 'browse'),
+(1, 4, 'todo', 'delete'),
+(1, 4, 'product', 'index'),
+(1, 4, 'product', 'view'),
+(1, 4, 'company', 'dynamic'),
+(1, 4, 'company', 'index'),
+(1, 4, 'company', 'browse'),
+(1, 4, 'report', 'bugSummary'),
+(1, 4, 'report', 'productInfo'),
+(1, 4, 'report', 'projectDeviation'),
+(1, 4, 'doc', 'edit'),
+(1, 4, 'doc', 'view'),
+(1, 4, 'group', 'browse'),
+(1, 4, 'report', 'index'),
+(1, 4, 'doc', 'create'),
+(1, 4, 'report', 'workload'),
+(1, 1, 'testtask', 'close'),
+(1, 5, 'story', 'close'),
+(1, 2, 'todo', 'batchCreate'),
+(1, 3, 'story', 'export'),
+(1, 4, 'product', 'roadmap'),
+(1, 4, 'user', 'todo'),
+(1, 6, 'report', 'index'),
+(1, 6, 'doc', 'editLib'),
 (1, 6, 'testtask', 'cases'),
 (1, 6, 'testtask', 'results'),
+(1, 6, 'doc', 'edit'),
 (1, 6, 'doc', 'index'),
 (1, 6, 'doc', 'browse'),
 (1, 6, 'doc', 'createLib'),
-(1, 6, 'doc', 'editLib'),
-(1, 6, 'doc', 'deleteLib'),
 (1, 6, 'doc', 'create'),
+(1, 6, 'doc', 'deleteLib'),
 (1, 6, 'doc', 'view'),
-(1, 6, 'doc', 'edit'),
-(1, 6, 'doc', 'delete'),
-(1, 6, 'report', 'index'),
-(1, 6, 'report', 'projectDeviation'),
-(1, 6, 'report', 'productInfo'),
-(1, 6, 'report', 'bugSummary'),
-(1, 6, 'report', 'workload'),
-(1, 6, 'company', 'index'),
-(1, 6, 'company', 'browse'),
-(1, 6, 'company', 'dynamic'),
-(1, 6, 'group', 'browse'),
-(1, 6, 'user', 'view'),
-(1, 6, 'user', 'todo'),
-(1, 6, 'user', 'task'),
-(1, 6, 'user', 'bug'),
-(1, 6, 'user', 'project'),
-(1, 6, 'user', 'dynamic'),
-(1, 6, 'user', 'profile'),
-(1, 6, 'svn', 'diff'),
-(1, 6, 'svn', 'cat'),
+(1, 6, 'todo', 'view'),
+(1, 6, 'todo', 'export'),
+(1, 6, 'todo', 'batchCreate'),
+(1, 6, 'my', 'dynamic'),
+(1, 6, 'todo', 'edit'),
+(1, 6, 'todo', 'create'),
+(1, 6, 'my', 'changePassword'),
+(1, 6, 'my', 'editProfile'),
+(1, 6, 'todo', 'delete'),
+(1, 6, 'testcase', 'batchEdit'),
+(1, 6, 'testtask', 'view'),
+(1, 6, 'testcase', 'delete'),
+(1, 6, 'testcase', 'export'),
+(1, 6, 'testtask', 'browse'),
+(1, 6, 'testtask', 'index'),
+(1, 6, 'testcase', 'confirmStoryChange'),
+(1, 6, 'task', 'cancel'),
+(1, 6, 'task', 'assignTo'),
+(1, 6, 'task', 'start'),
+(1, 6, 'task', 'finish'),
+(1, 6, 'testcase', 'edit'),
+(1, 6, 'testcase', 'view'),
+(1, 6, 'qa', 'index'),
+(1, 6, 'task', 'report'),
+(1, 6, 'build', 'view'),
+(1, 6, 'project', 'index'),
+(1, 6, 'project', 'burnData'),
+(1, 6, 'release', 'view'),
+(1, 6, 'project', 'dynamic'),
+(1, 6, 'project', 'computeBurn'),
+(1, 6, 'release', 'browse'),
+(1, 6, 'project', 'view'),
+(1, 6, 'project', 'bug'),
+(1, 6, 'productplan', 'view'),
+(1, 6, 'task', 'create'),
+(1, 6, 'project', 'story'),
+(1, 6, 'project', 'task'),
+(1, 6, 'project', 'doc'),
+(1, 6, 'project', 'burn'),
+(1, 6, 'testcase', 'create'),
+(1, 6, 'bug', 'saveTemplate'),
+(1, 6, 'bug', 'create'),
+(1, 6, 'bug', 'edit'),
+(1, 6, 'project', 'build'),
+(1, 6, 'bug', 'browse'),
+(1, 6, 'bug', 'view'),
+(1, 6, 'bug', 'customFields'),
+(1, 6, 'bug', 'deleteTemplate'),
+(1, 6, 'bug', 'export'),
+(1, 6, 'project', 'team'),
+(1, 6, 'testcase', 'browse'),
+(1, 6, 'bug', 'resolve'),
+(1, 6, 'bug', 'report'),
+(1, 6, 'testcase', 'index'),
+(1, 6, 'testcase', 'batchCreate'),
+(1, 6, 'release', 'export'),
+(1, 6, 'project', 'browse'),
+(1, 6, 'project', 'grouptask'),
+(1, 6, 'bug', 'index'),
+(1, 6, 'search', 'deleteQuery'),
+(1, 6, 'misc', 'ping'),
+(1, 6, 'file', 'delete'),
 (1, 6, 'svn', 'apiSync'),
-(1, 6, 'search', 'buildForm'),
+(1, 6, 'api', 'getModel'),
 (1, 6, 'search', 'buildQuery'),
 (1, 6, 'search', 'saveQuery'),
-(1, 6, 'search', 'deleteQuery'),
 (1, 6, 'search', 'select'),
-(1, 6, 'api', 'getModel'),
+(1, 6, 'search', 'buildForm'),
 (1, 6, 'file', 'download'),
 (1, 6, 'file', 'edit'),
-(1, 6, 'file', 'delete'),
-(1, 6, 'misc', 'ping'),
+(1, 6, 'product', 'roadmap'),
+(1, 6, 'story', 'tasks'),
+(1, 6, 'story', 'export'),
+(1, 6, 'productplan', 'browse'),
+(1, 6, 'product', 'view'),
+(1, 6, 'product', 'dynamic'),
+(1, 6, 'product', 'project'),
+(1, 6, 'product', 'doc'),
+(1, 6, 'story', 'view'),
+(1, 6, 'story', 'report'),
+(1, 6, 'todo', 'batchEdit'),
+(1, 6, 'product', 'browse'),
+(1, 6, 'todo', 'finish'),
+(1, 6, 'product', 'index'),
+(1, 6, 'todo', 'import2Today'),
+(1, 6, 'company', 'browse'),
+(1, 6, 'user', 'project'),
+(1, 6, 'user', 'task'),
+(1, 6, 'company', 'dynamic'),
+(1, 6, 'user', 'view'),
+(1, 6, 'user', 'bug'),
+(1, 6, 'company', 'index'),
+(1, 6, 'group', 'browse'),
+(1, 6, 'user', 'todo'),
+(1, 6, 'task', 'editEstimate'),
+(1, 6, 'task', 'confirmStoryChange'),
+(1, 6, 'task', 'recordEstimate'),
+(1, 6, 'task', 'deleteEstimate'),
+(1, 6, 'task', 'export'),
+(1, 6, 'user', 'dynamic'),
+(1, 6, 'svn', 'diff'),
+(1, 6, 'user', 'profile'),
+(1, 6, 'report', 'projectDeviation'),
+(1, 6, 'my', 'index'),
+(1, 6, 'my', 'todo'),
+(1, 6, 'my', 'task'),
+(1, 6, 'my', 'profile'),
+(1, 6, 'my', 'bug'),
+(1, 6, 'my', 'project'),
+(1, 6, 'my', 'story'),
+(1, 6, 'task', 'batchCreate'),
+(1, 6, 'task', 'batchEdit'),
+(1, 6, 'task', 'edit'),
+(1, 6, 'task', 'view'),
+(1, 6, 'task', 'delete'),
+(1, 6, 'task', 'batchClose'),
+(1, 6, 'task', 'activate'),
+(1, 6, 'task', 'close'),
+(1, 6, 'webapp', 'index'),
+(1, 6, 'report', 'bugSummary'),
+(1, 6, 'report', 'productInfo'),
+(1, 6, 'report', 'workload'),
+(1, 6, 'doc', 'delete'),
+(1, 7, 'story', 'change'),
+(1, 7, 'productplan', 'delete'),
+(1, 7, 'story', 'delete'),
 (1, 7, 'story', 'review'),
 (1, 7, 'story', 'activate'),
-(1, 7, 'story', 'view'),
-(1, 7, 'story', 'report'),
-(1, 7, 'story', 'delete'),
-(1, 7, 'story', 'change'),
-(1, 7, 'story', 'close'),
-(1, 7, 'productplan', 'edit'),
-(1, 7, 'product', 'roadmap'),
-(1, 7, 'productplan', 'delete'),
-(1, 7, 'productplan', 'linkStory'),
-(1, 7, 'release', 'create'),
-(1, 7, 'productplan', 'view'),
-(1, 7, 'productplan', 'unlinkStory'),
-(1, 7, 'release', 'edit'),
-(1, 7, 'release', 'browse'),
-(1, 7, 'product', 'close'),
-(1, 7, 'product', 'order'),
-(1, 7, 'release', 'view'),
-(1, 7, 'productplan', 'create'),
-(1, 7, 'release', 'delete'),
 (1, 7, 'story', 'batchEdit'),
-(1, 7, 'productplan', 'browse'),
-(1, 7, 'product', 'view'),
-(1, 7, 'product', 'project'),
-(1, 7, 'story', 'create'),
-(1, 7, 'product', 'browse'),
-(1, 7, 'story', 'batchCreate'),
-(1, 7, 'product', 'doc'),
-(1, 7, 'product', 'create'),
-(1, 7, 'product', 'index'),
-(1, 7, 'product', 'dynamic'),
-(1, 7, 'product', 'edit'),
-(1, 7, 'product', 'delete'),
-(1, 7, 'project', 'index'),
-(1, 7, 'project', 'view'),
-(1, 7, 'project', 'browse'),
-(1, 7, 'project', 'task'),
-(1, 7, 'project', 'grouptask'),
+(1, 7, 'story', 'report'),
+(1, 7, 'bug', 'resolve'),
+(1, 7, 'bug', 'customFields'),
+(1, 7, 'bug', 'report'),
+(1, 7, 'bug', 'edit'),
 (1, 7, 'project', 'story'),
-(1, 7, 'project', 'build'),
-(1, 7, 'project', 'testtask'),
-(1, 7, 'project', 'bug'),
-(1, 7, 'project', 'burn'),
-(1, 7, 'project', 'burnData'),
-(1, 7, 'project', 'team'),
-(1, 7, 'project', 'doc'),
-(1, 7, 'project', 'dynamic'),
-(1, 7, 'project', 'manageProducts'),
-(1, 7, 'project', 'linkStory'),
-(1, 7, 'task', 'view'),
-(1, 7, 'task', 'export'),
-(1, 7, 'task', 'report'),
-(1, 7, 'build', 'view'),
-(1, 7, 'qa', 'index'),
-(1, 7, 'bug', 'index'),
-(1, 7, 'bug', 'browse'),
 (1, 7, 'bug', 'create'),
 (1, 7, 'bug', 'view'),
-(1, 7, 'bug', 'edit'),
-(1, 7, 'bug', 'resolve'),
-(1, 7, 'bug', 'report'),
+(1, 7, 'project', 'task'),
+(1, 7, 'project', 'build'),
+(1, 7, 'testtask', 'cases'),
+(1, 7, 'testcase', 'index'),
+(1, 7, 'project', 'view'),
 (1, 7, 'bug', 'export'),
+(1, 7, 'project', 'grouptask'),
+(1, 7, 'productplan', 'browse'),
 (1, 7, 'bug', 'saveTemplate'),
 (1, 7, 'bug', 'deleteTemplate'),
-(1, 7, 'bug', 'customFields'),
 (1, 7, 'bug', 'batchEdit'),
-(1, 7, 'testcase', 'index'),
-(1, 7, 'testcase', 'browse'),
-(1, 7, 'testcase', 'view'),
-(1, 7, 'testcase', 'export'),
-(1, 7, 'testtask', 'index'),
-(1, 7, 'testtask', 'browse'),
-(1, 7, 'testtask', 'view'),
-(1, 7, 'testtask', 'cases'),
+(1, 7, 'story', 'tasks'),
 (1, 7, 'testtask', 'results'),
-(1, 7, 'doc', 'index'),
-(1, 7, 'doc', 'browse'),
-(1, 7, 'doc', 'createLib'),
-(1, 7, 'doc', 'editLib'),
-(1, 7, 'doc', 'deleteLib'),
-(1, 7, 'doc', 'create'),
-(1, 7, 'doc', 'view'),
-(1, 7, 'doc', 'edit'),
-(1, 7, 'doc', 'delete'),
-(1, 7, 'report', 'index'),
-(1, 7, 'report', 'projectDeviation'),
-(1, 7, 'report', 'productInfo'),
-(1, 7, 'report', 'bugSummary'),
-(1, 7, 'report', 'workload'),
-(1, 7, 'company', 'index'),
-(1, 7, 'company', 'browse'),
-(1, 7, 'company', 'dynamic'),
-(1, 7, 'group', 'browse'),
-(1, 7, 'user', 'view'),
-(1, 7, 'user', 'todo'),
-(1, 7, 'user', 'task'),
-(1, 7, 'user', 'bug'),
-(1, 7, 'user', 'project'),
-(1, 7, 'user', 'dynamic'),
-(1, 7, 'user', 'profile'),
-(1, 7, 'svn', 'diff'),
-(1, 7, 'svn', 'cat'),
-(1, 7, 'svn', 'apiSync'),
-(1, 7, 'search', 'buildForm'),
-(1, 7, 'search', 'buildQuery'),
+(1, 7, 'productplan', 'create'),
+(1, 7, 'testtask', 'index'),
+(1, 7, 'testtask', 'view'),
+(1, 7, 'testcase', 'browse'),
+(1, 7, 'testcase', 'export'),
+(1, 7, 'testcase', 'view'),
+(1, 7, 'testtask', 'browse'),
+(1, 7, 'project', 'linkStory'),
+(1, 7, 'project', 'bug'),
+(1, 7, 'bug', 'browse'),
+(1, 7, 'project', 'team'),
+(1, 7, 'task', 'view'),
+(1, 7, 'project', 'doc'),
+(1, 7, 'qa', 'index'),
+(1, 7, 'project', 'burn'),
+(1, 7, 'bug', 'index'),
+(1, 7, 'build', 'view'),
+(1, 7, 'task', 'report'),
+(1, 7, 'project', 'burnData'),
+(1, 7, 'task', 'recordEstimate'),
+(1, 7, 'task', 'export'),
+(1, 7, 'project', 'dynamic'),
+(1, 7, 'project', 'manageProducts'),
+(1, 7, 'product', 'project'),
+(1, 7, 'story', 'create'),
+(1, 7, 'product', 'close'),
 (1, 7, 'search', 'saveQuery'),
+(1, 7, 'project', 'testtask'),
+(1, 7, 'tree', 'manageChild'),
+(1, 7, 'file', 'delete'),
+(1, 7, 'file', 'edit'),
 (1, 7, 'search', 'deleteQuery'),
-(1, 7, 'search', 'select'),
+(1, 7, 'tree', 'fix'),
 (1, 7, 'tree', 'browse'),
 (1, 7, 'tree', 'updateOrder'),
-(1, 7, 'tree', 'manageChild'),
 (1, 7, 'tree', 'edit'),
-(1, 7, 'tree', 'fix'),
+(1, 7, 'search', 'select'),
 (1, 7, 'tree', 'delete'),
 (1, 7, 'file', 'download'),
-(1, 7, 'file', 'edit'),
-(1, 7, 'file', 'delete'),
 (1, 7, 'misc', 'ping'),
+(1, 7, 'product', 'roadmap'),
+(1, 7, 'product', 'dynamic'),
+(1, 7, 'product', 'delete'),
+(1, 7, 'product', 'doc'),
+(1, 7, 'product', 'view'),
+(1, 7, 'product', 'order'),
+(1, 7, 'product', 'browse'),
+(1, 7, 'product', 'edit'),
+(1, 7, 'product', 'create'),
+(1, 7, 'user', 'todo'),
+(1, 7, 'svn', 'cat'),
+(1, 7, 'user', 'profile'),
+(1, 7, 'user', 'task'),
+(1, 7, 'user', 'project'),
+(1, 7, 'svn', 'diff'),
+(1, 7, 'user', 'view'),
+(1, 7, 'user', 'bug'),
+(1, 7, 'user', 'dynamic'),
+(1, 7, 'release', 'export'),
+(1, 7, 'release', 'delete'),
+(1, 7, 'release', 'view'),
+(1, 7, 'project', 'index'),
+(1, 7, 'release', 'edit'),
+(1, 7, 'svn', 'apiSync'),
+(1, 7, 'search', 'buildQuery'),
+(1, 7, 'search', 'buildForm'),
+(1, 7, 'company', 'index'),
+(1, 7, 'my', 'index'),
+(1, 7, 'my', 'todo'),
+(1, 7, 'my', 'task'),
+(1, 7, 'my', 'story'),
+(1, 7, 'my', 'bug'),
+(1, 7, 'my', 'testCase'),
+(1, 7, 'my', 'testTask'),
+(1, 7, 'story', 'batchCreate'),
+(1, 7, 'story', 'edit'),
+(1, 7, 'story', 'export'),
+(1, 7, 'release', 'create'),
+(1, 7, 'release', 'browse'),
+(1, 7, 'productplan', 'linkStory'),
+(1, 7, 'productplan', 'unlinkStory'),
+(1, 7, 'productplan', 'view'),
+(1, 7, 'todo', 'create'),
+(1, 7, 'my', 'project'),
+(1, 7, 'my', 'profile'),
+(1, 7, 'my', 'editProfile'),
+(1, 7, 'my', 'dynamic'),
+(1, 7, 'my', 'changePassword'),
+(1, 7, 'company', 'dynamic'),
+(1, 7, 'company', 'browse'),
+(1, 7, 'group', 'browse'),
+(1, 7, 'report', 'bugSummary'),
 (1, 8, 'doc', 'view'),
 (1, 8, 'doc', 'index'),
 (1, 8, 'bug', 'assignTo'),
@@ -2046,197 +2018,197 @@ INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
 (1, 8, 'doc', 'delete'),
 (1, 8, 'report', 'projectDeviation'),
 (1, 8, 'doc', 'create'),
-(1, 9, 'my', 'changePassword'),
-(1, 9, 'todo', 'create'),
+(1, 9, 'doc', 'create'),
 (1, 9, 'todo', 'batchCreate'),
-(1, 9, 'todo', 'edit'),
 (1, 9, 'todo', 'view'),
-(1, 9, 'todo', 'delete'),
-(1, 9, 'todo', 'export'),
-(1, 9, 'todo', 'finish'),
-(1, 9, 'todo', 'import2Today'),
-(1, 9, 'todo', 'batchEdit'),
-(1, 9, 'product', 'index'),
-(1, 9, 'product', 'browse'),
-(1, 9, 'product', 'view'),
-(1, 9, 'product', 'roadmap'),
-(1, 9, 'product', 'doc'),
-(1, 9, 'product', 'dynamic'),
-(1, 9, 'product', 'project'),
-(1, 9, 'story', 'export'),
-(1, 9, 'story', 'view'),
-(1, 9, 'story', 'review'),
-(1, 9, 'story', 'tasks'),
-(1, 9, 'story', 'report'),
-(1, 9, 'productplan', 'browse'),
-(1, 9, 'productplan', 'view'),
-(1, 9, 'release', 'browse'),
-(1, 9, 'release', 'view'),
-(1, 9, 'release', 'export'),
-(1, 9, 'project', 'index'),
-(1, 9, 'project', 'view'),
-(1, 9, 'project', 'browse'),
-(1, 9, 'project', 'order'),
-(1, 9, 'project', 'task'),
-(1, 9, 'project', 'grouptask'),
-(1, 9, 'project', 'story'),
-(1, 9, 'project', 'build'),
-(1, 9, 'project', 'bug'),
-(1, 9, 'project', 'burn'),
-(1, 9, 'project', 'computeBurn'),
-(1, 9, 'project', 'burnData'),
-(1, 9, 'project', 'team'),
-(1, 9, 'project', 'doc'),
-(1, 9, 'project', 'dynamic'),
-(1, 9, 'project', 'manageProducts'),
-(1, 9, 'project', 'manageMembers'),
-(1, 9, 'project', 'unlinkMember'),
-(1, 9, 'task', 'view'),
-(1, 9, 'task', 'export'),
-(1, 9, 'task', 'report'),
-(1, 9, 'build', 'delete'),
-(1, 9, 'build', 'view'),
-(1, 9, 'qa', 'index'),
-(1, 9, 'bug', 'index'),
-(1, 9, 'bug', 'browse'),
-(1, 9, 'bug', 'view'),
-(1, 9, 'bug', 'assignTo'),
-(1, 9, 'bug', 'report'),
+(1, 9, 'my', 'changePassword'),
+(1, 9, 'my', 'project'),
+(1, 9, 'todo', 'create'),
+(1, 9, 'my', 'editProfile'),
+(1, 9, 'my', 'dynamic'),
+(1, 9, 'my', 'profile'),
+(1, 9, 'todo', 'edit'),
+(1, 9, 'testcase', 'index'),
+(1, 9, 'testcase', 'export'),
 (1, 9, 'bug', 'export'),
 (1, 9, 'bug', 'saveTemplate'),
-(1, 9, 'bug', 'customFields'),
-(1, 9, 'testcase', 'index'),
-(1, 9, 'testcase', 'browse'),
 (1, 9, 'testcase', 'view'),
-(1, 9, 'testcase', 'export'),
-(1, 9, 'testtask', 'index'),
-(1, 9, 'testtask', 'browse'),
-(1, 9, 'testtask', 'view'),
-(1, 9, 'testtask', 'cases'),
-(1, 9, 'testtask', 'linkcase'),
-(1, 9, 'doc', 'index'),
-(1, 9, 'doc', 'browse'),
-(1, 9, 'doc', 'createLib'),
-(1, 9, 'doc', 'editLib'),
-(1, 9, 'doc', 'deleteLib'),
-(1, 9, 'doc', 'create'),
-(1, 9, 'doc', 'view'),
-(1, 9, 'doc', 'edit'),
-(1, 9, 'doc', 'delete'),
-(1, 9, 'report', 'index'),
-(1, 9, 'report', 'projectDeviation'),
-(1, 9, 'report', 'productInfo'),
-(1, 9, 'report', 'bugSummary'),
-(1, 9, 'report', 'workload'),
+(1, 9, 'testcase', 'browse'),
+(1, 9, 'bug', 'customFields'),
+(1, 9, 'story', 'report'),
+(1, 9, 'story', 'export'),
+(1, 9, 'story', 'review'),
+(1, 9, 'story', 'view'),
+(1, 9, 'story', 'tasks'),
+(1, 9, 'bug', 'report'),
+(1, 9, 'bug', 'assignTo'),
+(1, 9, 'project', 'bug'),
+(1, 9, 'project', 'story'),
+(1, 9, 'project', 'build'),
+(1, 9, 'task', 'view'),
+(1, 9, 'project', 'computeBurn'),
+(1, 9, 'bug', 'view'),
+(1, 9, 'project', 'manageProducts'),
+(1, 9, 'project', 'doc'),
+(1, 9, 'task', 'export'),
+(1, 9, 'project', 'dynamic'),
+(1, 9, 'bug', 'index'),
+(1, 9, 'bug', 'browse'),
+(1, 9, 'qa', 'index'),
+(1, 9, 'build', 'delete'),
+(1, 9, 'build', 'view'),
+(1, 9, 'project', 'team'),
+(1, 9, 'task', 'report'),
+(1, 9, 'task', 'recordEstimate'),
+(1, 9, 'project', 'manageMembers'),
+(1, 9, 'project', 'unlinkMember'),
+(1, 9, 'project', 'burnData'),
+(1, 9, 'product', 'doc'),
+(1, 9, 'product', 'project'),
+(1, 9, 'product', 'dynamic'),
+(1, 9, 'admin', 'index'),
+(1, 9, 'user', 'profile'),
+(1, 9, 'project', 'burn'),
+(1, 9, 'search', 'deleteQuery'),
+(1, 9, 'file', 'edit'),
+(1, 9, 'search', 'buildForm'),
+(1, 9, 'file', 'delete'),
+(1, 9, 'search', 'saveQuery'),
+(1, 9, 'search', 'select'),
+(1, 9, 'search', 'buildQuery'),
+(1, 9, 'file', 'download'),
+(1, 9, 'product', 'browse'),
+(1, 9, 'product', 'roadmap'),
+(1, 9, 'product', 'index'),
+(1, 9, 'product', 'view'),
+(1, 9, 'todo', 'finish'),
+(1, 9, 'todo', 'batchEdit'),
+(1, 9, 'todo', 'delete'),
+(1, 9, 'todo', 'import2Today'),
+(1, 9, 'todo', 'export'),
 (1, 9, 'report', 'bugAssign'),
-(1, 9, 'company', 'index'),
-(1, 9, 'company', 'browse'),
-(1, 9, 'company', 'create'),
-(1, 9, 'company', 'edit'),
-(1, 9, 'company', 'delete'),
-(1, 9, 'company', 'dynamic'),
 (1, 9, 'dept', 'browse'),
+(1, 9, 'company', 'delete'),
+(1, 9, 'company', 'index'),
+(1, 9, 'company', 'create'),
+(1, 9, 'company', 'dynamic'),
+(1, 9, 'report', 'workload'),
+(1, 9, 'company', 'browse'),
+(1, 9, 'company', 'edit'),
+(1, 9, 'project', 'order'),
+(1, 9, 'project', 'view'),
+(1, 9, 'project', 'browse'),
+(1, 9, 'project', 'task'),
+(1, 9, 'project', 'index'),
+(1, 9, 'project', 'grouptask'),
+(1, 9, 'user', 'view'),
+(1, 9, 'user', 'dynamic'),
+(1, 9, 'user', 'project'),
+(1, 9, 'user', 'unlock'),
+(1, 9, 'user', 'task'),
+(1, 9, 'user', 'todo'),
+(1, 9, 'group', 'browse'),
 (1, 9, 'dept', 'updateOrder'),
 (1, 9, 'dept', 'manageChild'),
 (1, 9, 'dept', 'delete'),
-(1, 9, 'group', 'browse'),
-(1, 9, 'user', 'view'),
-(1, 9, 'user', 'unlock'),
-(1, 9, 'user', 'todo'),
-(1, 9, 'user', 'task'),
-(1, 9, 'user', 'project'),
-(1, 9, 'user', 'dynamic'),
-(1, 9, 'user', 'profile'),
-(1, 9, 'admin', 'index'),
-(1, 9, 'search', 'buildForm'),
-(1, 9, 'search', 'buildQuery'),
-(1, 9, 'search', 'saveQuery'),
-(1, 9, 'search', 'deleteQuery'),
-(1, 9, 'search', 'select'),
-(1, 9, 'file', 'download'),
-(1, 9, 'file', 'edit'),
-(1, 9, 'file', 'delete'),
+(1, 9, 'report', 'index'),
+(1, 9, 'my', 'index'),
+(1, 9, 'my', 'todo'),
+(1, 9, 'my', 'task'),
+(1, 9, 'my', 'bug'),
+(1, 9, 'my', 'testTask'),
+(1, 9, 'my', 'story'),
+(1, 9, 'my', 'testCase'),
 (1, 9, 'misc', 'ping'),
-(1, 10, 'index', 'index'),
-(1, 10, 'my', 'index'),
-(1, 10, 'my', 'todo'),
-(1, 10, 'my', 'task'),
-(1, 10, 'my', 'bug'),
-(1, 10, 'my', 'testTask'),
-(1, 10, 'my', 'testCase'),
-(1, 10, 'my', 'story'),
-(1, 10, 'my', 'project'),
-(1, 10, 'my', 'profile'),
-(1, 10, 'my', 'dynamic'),
-(1, 10, 'my', 'editProfile'),
-(1, 10, 'my', 'changePassword'),
-(1, 10, 'todo', 'create'),
-(1, 10, 'todo', 'batchCreate'),
-(1, 10, 'todo', 'edit'),
-(1, 10, 'todo', 'view'),
-(1, 10, 'todo', 'delete'),
-(1, 10, 'todo', 'export'),
-(1, 10, 'todo', 'finish'),
-(1, 10, 'todo', 'import2Today'),
-(1, 10, 'todo', 'batchEdit'),
-(1, 10, 'product', 'index'),
-(1, 10, 'product', 'browse'),
-(1, 10, 'product', 'view'),
-(1, 10, 'product', 'roadmap'),
-(1, 10, 'product', 'doc'),
-(1, 10, 'product', 'dynamic'),
-(1, 10, 'story', 'view'),
-(1, 10, 'story', 'tasks'),
-(1, 10, 'productplan', 'browse'),
-(1, 10, 'productplan', 'view'),
-(1, 10, 'release', 'browse'),
-(1, 10, 'release', 'view'),
-(1, 10, 'project', 'index'),
-(1, 10, 'project', 'view'),
-(1, 10, 'project', 'browse'),
-(1, 10, 'project', 'task'),
-(1, 10, 'project', 'grouptask'),
-(1, 10, 'project', 'story'),
-(1, 10, 'project', 'build'),
-(1, 10, 'project', 'testtask'),
-(1, 10, 'project', 'bug'),
-(1, 10, 'project', 'burn'),
-(1, 10, 'project', 'team'),
-(1, 10, 'project', 'doc'),
-(1, 10, 'project', 'dynamic'),
-(1, 10, 'task', 'view'),
-(1, 10, 'build', 'view'),
-(1, 10, 'qa', 'index'),
-(1, 10, 'bug', 'index'),
-(1, 10, 'bug', 'browse'),
-(1, 10, 'bug', 'view'),
+(1, 9, 'release', 'export'),
+(1, 9, 'release', 'view'),
+(1, 9, 'productplan', 'view'),
+(1, 9, 'release', 'browse'),
+(1, 9, 'productplan', 'browse'),
+(1, 9, 'report', 'productInfo'),
+(1, 9, 'report', 'projectDeviation'),
+(1, 9, 'report', 'bugSummary'),
+(1, 9, 'doc', 'edit'),
+(1, 10, 'company', 'browse'),
+(1, 10, 'testtask', 'cases'),
 (1, 10, 'bug', 'report'),
+(1, 10, 'testcase', 'view'),
+(1, 10, 'doc', 'view'),
 (1, 10, 'testcase', 'index'),
 (1, 10, 'testcase', 'browse'),
-(1, 10, 'testcase', 'view'),
 (1, 10, 'testtask', 'index'),
 (1, 10, 'testtask', 'browse'),
 (1, 10, 'testtask', 'view'),
-(1, 10, 'testtask', 'cases'),
-(1, 10, 'testtask', 'results'),
 (1, 10, 'doc', 'index'),
+(1, 10, 'testtask', 'results'),
 (1, 10, 'doc', 'browse'),
-(1, 10, 'doc', 'view'),
-(1, 10, 'company', 'index'),
-(1, 10, 'company', 'browse'),
-(1, 10, 'company', 'dynamic'),
-(1, 10, 'group', 'browse'),
-(1, 10, 'user', 'view'),
-(1, 10, 'user', 'todo'),
-(1, 10, 'user', 'task'),
-(1, 10, 'user', 'bug'),
-(1, 10, 'user', 'project'),
-(1, 10, 'user', 'dynamic'),
+(1, 10, 'todo', 'batchCreate'),
+(1, 10, 'todo', 'view'),
+(1, 10, 'my', 'changePassword'),
+(1, 10, 'my', 'project'),
+(1, 10, 'todo', 'create'),
+(1, 10, 'my', 'editProfile'),
+(1, 10, 'my', 'dynamic'),
+(1, 10, 'my', 'profile'),
+(1, 10, 'todo', 'edit'),
+(1, 10, 'qa', 'index'),
+(1, 10, 'bug', 'view'),
+(1, 10, 'task', 'recordEstimate'),
+(1, 10, 'build', 'view'),
+(1, 10, 'bug', 'browse'),
+(1, 10, 'bug', 'index'),
+(1, 10, 'product', 'doc'),
+(1, 10, 'product', 'dynamic'),
+(1, 10, 'task', 'view'),
+(1, 10, 'project', 'dynamic'),
+(1, 10, 'productplan', 'view'),
+(1, 10, 'productplan', 'browse'),
+(1, 10, 'project', 'grouptask'),
+(1, 10, 'release', 'view'),
+(1, 10, 'project', 'doc'),
+(1, 10, 'project', 'browse'),
+(1, 10, 'project', 'story'),
+(1, 10, 'project', 'task'),
+(1, 10, 'project', 'burn'),
+(1, 10, 'project', 'index'),
+(1, 10, 'project', 'team'),
+(1, 10, 'project', 'bug'),
+(1, 10, 'project', 'view'),
+(1, 10, 'project', 'testtask'),
+(1, 10, 'project', 'build'),
+(1, 10, 'product', 'roadmap'),
 (1, 10, 'user', 'profile'),
-(1, 10, 'search', 'buildForm'),
-(1, 10, 'search', 'buildQuery'),
+(1, 10, 'release', 'browse'),
 (1, 10, 'file', 'download'),
 (1, 10, 'misc', 'ping'),
+(1, 10, 'search', 'buildForm'),
+(1, 10, 'search', 'buildQuery'),
+(1, 10, 'product', 'browse'),
+(1, 10, 'product', 'view'),
+(1, 10, 'product', 'index'),
+(1, 10, 'todo', 'finish'),
+(1, 10, 'todo', 'batchEdit'),
+(1, 10, 'todo', 'delete'),
+(1, 10, 'todo', 'import2Today'),
+(1, 10, 'todo', 'export'),
+(1, 10, 'user', 'todo'),
+(1, 10, 'user', 'task'),
+(1, 10, 'user', 'view'),
+(1, 10, 'user', 'bug'),
+(1, 10, 'user', 'dynamic'),
+(1, 10, 'user', 'project'),
+(1, 10, 'company', 'dynamic'),
+(1, 10, 'my', 'index'),
+(1, 10, 'my', 'todo'),
+(1, 10, 'my', 'task'),
+(1, 10, 'my', 'story'),
+(1, 10, 'my', 'bug'),
+(1, 10, 'my', 'testCase'),
+(1, 10, 'my', 'testTask'),
+(1, 10, 'story', 'tasks'),
+(1, 10, 'story', 'view'),
+(1, 10, 'group', 'browse'),
+(1, 10, 'company', 'index'),
 (1, 1, 'tree', 'manageChild'),
 (1, 1, 'svn', 'diff'),
 (1, 1, 'testtask', 'start'),
@@ -2251,20 +2223,20 @@ INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
 (1, 1, 'file', 'edit'),
 (1, 1, 'todo', 'batchCreate'),
 (1, 8, 'misc', 'ping'),
-(1, 3, 'misc', 'ping'),
+(1, 3, 'build', 'view'),
 (1, 1, 'convert', 'execute'),
 (1, 1, 'extension', 'structure'),
 (1, 1, 'company', 'dynamic'),
-(1, 2, 'webapp', 'index'),
-(1, 3, 'webapp', 'index'),
-(1, 4, 'webapp', 'index'),
-(1, 5, 'webapp', 'index'),
-(1, 6, 'webapp', 'index'),
-(1, 7, 'webapp', 'index'),
+(1, 2, 'report', 'index'),
+(1, 3, 'user', 'todo'),
+(1, 4, 'index', 'index'),
+(1, 5, 'index', 'index'),
+(1, 6, 'index', 'index'),
+(1, 7, 'index', 'index'),
 (1, 8, 'webapp', 'index'),
-(1, 9, 'webapp', 'index'),
-(1, 10, 'webapp', 'index'),
-(1, 11, 'webapp', 'index'),
+(1, 9, 'index', 'index'),
+(1, 10, 'index', 'index'),
+(1, 11, 'index', 'index'),
 (1, 1, 'product', 'create'),
 (1, 1, 'product', 'browse'),
 (1, 1, 'product', 'view'),
@@ -2279,17 +2251,46 @@ INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
 (1, 1, 'my', 'bug'),
 (1, 1, 'my', 'todo'),
 (1, 1, 'index', 'index'),
-(1, 2, 'task', 'report'),
+(1, 2, 'project', 'doc'),
 (1, 8, 'testtask', 'results'),
 (1, 8, 'testtask', 'batchRun'),
-(1, 4, 'build', 'view'),
-(1, 6, 'build', 'view'),
-(1, 5, 'release', 'export'),
-(1, 7, 'release', 'export'),
+(1, 4, 'tree', 'browse'),
+(1, 6, 'svn', 'cat'),
+(1, 5, 'project', 'browse'),
+(1, 7, 'project', 'browse'),
 (1, 1, 'webapp', 'create'),
 (1, 1, 'webapp', 'edit'),
 (1, 1, 'webapp', 'view'),
 (1, 1, 'webapp', 'install'),
 (1, 1, 'webapp', 'uninstall'),
-(1, 2, 'task', 'record'),
-(1, 2, 'build', 'view');
+(1, 2, 'task', 'create'),
+(1, 2, 'project', 'burnData'),
+(1, 3, 'file', 'download'),
+(1, 3, 'tree', 'fix'),
+(1, 3, 'search', 'deleteQuery'),
+(1, 3, 'file', 'delete'),
+(1, 3, 'bug', 'delete'),
+(1, 3, 'todo', 'batchEdit'),
+(1, 3, 'doc', 'browse'),
+(1, 3, 'doc', 'createLib'),
+(1, 3, 'doc', 'deleteLib'),
+(1, 3, 'doc', 'create'),
+(1, 3, 'doc', 'view'),
+(1, 3, 'bug', 'resolve'),
+(1, 3, 'bug', 'assignTo'),
+(1, 3, 'bug', 'close'),
+(1, 3, 'group', 'browse'),
+(1, 3, 'report', 'index'),
+(1, 3, 'index', 'index'),
+(1, 3, 'webapp', 'view'),
+(1, 2, 'webapp', 'obtain'),
+(1, 2, 'webapp', 'view'),
+(1, 9, 'webapp', 'obtain'),
+(1, 9, 'webapp', 'create'),
+(1, 9, 'webapp', 'edit'),
+(1, 9, 'webapp', 'view'),
+(1, 9, 'webapp', 'install'),
+(1, 9, 'webapp', 'uninstall'),
+(1, 10, 'webapp', 'index'),
+(1, 10, 'webapp', 'obtain'),
+(1, 10, 'webapp', 'view');
diff --git a/module/task/model.php b/module/task/model.php
index d9cb8f365b..5880c89ec6 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -466,7 +466,7 @@ class taskModel extends model
         $oldTask = new stdClass();
         $newTask = new stdClass();
         $oldTask->consumed = $task->consumed;
-        $newTask->consumed = $consumed;
+        $newTask->consumed = $task->consumed + $consumed;
         $oldTask->left     = $task->left;
         $newTask->left     = $left;
         $oldTask->status   = $oldStatus;
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 2e9f7a365f..1edaed9585 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -27,6 +27,11 @@
       <th class='w-50px'><?php echo $lang->task->pri;?></th>
     </tr>
 
+    <?php
+    $stories['ditto'] = $this->lang->task->ditto; 
+    $lang->task->typeList['ditto'] = $lang->task->ditto; 
+    $members['ditto'] = $lang->task->ditto;
+    ?>
     <?php for($i = 0; $i < $config->task->batchCreate; $i++):?>
     <?php 
     if($i == 0)
@@ -37,13 +42,9 @@
     }
     else
     {
-        $stories['ditto'] = $this->lang->task->ditto; 
-        $lang->task->typeList['ditto'] = $lang->task->ditto; 
-        $members['ditto'] = $lang->task->ditto;
         $story = $type = $member = 'ditto';
     }
     ?>
-
     <?php $pri = 3;?>
     <tr class='a-center'>
       <td><?php echo $i+1;?></td>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index e3a77df273..6df407c351 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -109,7 +109,7 @@ userList               = "<?php echo join(',', array_keys($users));?>".split(','
           </tr>  
           <tr>
             <th class='rowhead'><?php echo $lang->task->consumed;?></th>
-            <td><?php echo $task->consumed . ' '; common::printIcon('task', 'record',   "taskID=$task->id", $task, 'list', '', '', 'iframe', true);?></td>
+            <td><?php echo $task->consumed . ' '; common::printIcon('task', 'recordEstimate',   "taskID=$task->id", $task, 'list', '', '', 'iframe', true);?></td>
           </tr>  
           <tr>
             <th class='rowhead'><?php echo $lang->task->left;?></th>
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 8bd9e6bb35..2309b8e521 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -14,7 +14,6 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('confirmFinish', $lang->task->confirmFinish);?>
 <form method='post' target='hiddenwin'>
-  <?php if($estimates):?>
   <table class='table-1'>
     <caption><?php echo $task->name;?></caption>
     <tr>
@@ -44,7 +43,6 @@
     </tr>
     <?php endforeach;?>
   </table>
-  <?php endif;?>
   <?php if($task->status == 'wait' or $task->status == 'doing'):?>
   <table class='table-1'>
     <caption><?php echo $lang->task->logEfforts;?></caption>