From cd5c9ed06e48847359a1697c58d1f3cc332aa809 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 18 May 2015 15:13:09 +0800 Subject: [PATCH] * change group priv and fix bug. --- db/zentao.sql | 450 ++++++++++++++++++----------- module/install/view/step5.html.php | 2 +- module/user/view/login.html.php | 2 +- 3 files changed, 281 insertions(+), 173 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index fc87f65dbc..4f22fb1391 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -692,11 +692,20 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'action', 'trash'), (1, 'action', 'undelete'), (1, 'admin', 'checkDB'), +(1, 'admin', 'checkWeak'), (1, 'admin', 'index'), +(1, 'admin', 'safe'), (1, 'api', 'debug'), (1, 'api', 'getModel'), +(1, 'api', 'sql'), +(1, 'backup', 'backup'), +(1, 'backup', 'change'), +(1, 'backup', 'delete'), +(1, 'backup', 'index'), +(1, 'backup', 'restore'), (1, 'bug', 'activate'), (1, 'bug', 'assignTo'), +(1, 'bug', 'batchAssignTo'), (1, 'bug', 'batchClose'), (1, 'bug', 'batchConfirm'), (1, 'bug', 'batchCreate'), @@ -716,9 +725,15 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'bug', 'resolve'), (1, 'bug', 'saveTemplate'), (1, 'bug', 'view'), +(1, 'build', 'batchUnlinkBug'), +(1, 'build', 'batchUnlinkStory'), (1, 'build', 'create'), (1, 'build', 'delete'), (1, 'build', 'edit'), +(1, 'build', 'linkBug'), +(1, 'build', 'linkStory'), +(1, 'build', 'unlinkBug'), +(1, 'build', 'unlinkStory'), (1, 'build', 'view'), (1, 'company', 'browse'), (1, 'company', 'dynamic'), @@ -736,13 +751,23 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'convert', 'setBugfree'), (1, 'convert', 'setConfig'), (1, 'convert', 'setRedmine'), +(1, 'cron', 'create'), +(1, 'cron', 'delete'), +(1, 'cron', 'edit'), +(1, 'cron', 'index'), +(1, 'cron', 'toggle'), +(1, 'cron', 'turnon'), +(1, 'custom', 'flow'), (1, 'custom', 'index'), (1, 'custom', 'restore'), (1, 'custom', 'set'), (1, 'dept', 'browse'), (1, 'dept', 'delete'), +(1, 'dept', 'edit'), (1, 'dept', 'manageChild'), (1, 'dept', 'updateOrder'), +(1, 'dev', 'api'), +(1, 'dev', 'db'), (1, 'doc', 'browse'), (1, 'doc', 'create'), (1, 'doc', 'createLib'), @@ -771,6 +796,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'file', 'delete'), (1, 'file', 'download'), (1, 'file', 'edit'), +(1, 'file', 'uploadImages'), (1, 'git', 'apiSync'), (1, 'git', 'cat'), (1, 'git', 'diff'), @@ -781,7 +807,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'group', 'edit'), (1, 'group', 'manageMember'), (1, 'group', 'managePriv'), +(1, 'group', 'manageView'), (1, 'index', 'index'), +(1, 'mail', 'batchDelete'), +(1, 'mail', 'browse'), +(1, 'mail', 'delete'), (1, 'mail', 'detect'), (1, 'mail', 'edit'), (1, 'mail', 'index'), @@ -827,6 +857,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'productplan', 'view'), (1, 'project', 'activate'), (1, 'project', 'batchedit'), +(1, 'project', 'batchUnlinkStory'), (1, 'project', 'browse'), (1, 'project', 'bug'), (1, 'project', 'build'), @@ -858,11 +889,17 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'project', 'unlinkStory'), (1, 'project', 'view'), (1, 'qa', 'index'), +(1, 'release', 'batchUnlinkBug'), +(1, 'release', 'batchUnlinkStory'), (1, 'release', 'browse'), (1, 'release', 'create'), (1, 'release', 'delete'), (1, 'release', 'edit'), (1, 'release', 'export'), +(1, 'release', 'linkBug'), +(1, 'release', 'linkStory'), +(1, 'release', 'unlinkBug'), +(1, 'release', 'unlinkStory'), (1, 'release', 'view'), (1, 'report', 'bugAssign'), (1, 'report', 'bugSummary'), @@ -876,6 +913,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'search', 'saveQuery'), (1, 'search', 'select'), (1, 'story', 'activate'), +(1, 'story', 'batchAssignTo'), (1, 'story', 'batchChangePlan'), (1, 'story', 'batchChangeStage'), (1, 'story', 'batchClose'), @@ -898,6 +936,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'svn', 'diff'), (1, 'task', 'activate'), (1, 'task', 'assignTo'), +(1, 'task', 'batchAssignTo'), (1, 'task', 'batchClose'), (1, 'task', 'batchCreate'), (1, 'task', 'batchEdit'), @@ -914,10 +953,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'task', 'pause'), (1, 'task', 'recordEstimate'), (1, 'task', 'report'), -(1, 'task', 'start'), (1, 'task', 'restart'), +(1, 'task', 'start'), (1, 'task', 'view'), (1, 'testcase', 'batchCreate'), +(1, 'testcase', 'batchDelete'), (1, 'testcase', 'batchEdit'), (1, 'testcase', 'browse'), (1, 'testcase', 'confirmChange'), @@ -988,6 +1028,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2, 'api', 'getModel'), (2, 'bug', 'activate'), (2, 'bug', 'assignTo'), +(2, 'bug', 'batchAssignTo'), (2, 'bug', 'batchClose'), (2, 'bug', 'batchConfirm'), (2, 'bug', 'batchCreate'), @@ -1087,6 +1128,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2, 'svn', 'diff'), (2, 'task', 'activate'), (2, 'task', 'assignTo'), +(2, 'task', 'batchAssignTo'), (2, 'task', 'batchClose'), (2, 'task', 'batchCreate'), (2, 'task', 'batchEdit'), @@ -1102,8 +1144,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2, 'task', 'pause'), (2, 'task', 'recordEstimate'), (2, 'task', 'report'), -(2, 'task', 'start'), (2, 'task', 'restart'), +(2, 'task', 'start'), (2, 'task', 'view'), (2, 'testcase', 'browse'), (2, 'testcase', 'export'), @@ -1245,6 +1287,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3, 'svn', 'diff'), (3, 'task', 'activate'), (3, 'task', 'assignTo'), +(3, 'task', 'batchAssignTo'), (3, 'task', 'batchClose'), (3, 'task', 'batchCreate'), (3, 'task', 'batchEdit'), @@ -1260,8 +1303,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3, 'task', 'pause'), (3, 'task', 'recordEstimate'), (3, 'task', 'report'), -(3, 'task', 'start'), (3, 'task', 'restart'), +(3, 'task', 'start'), (3, 'task', 'view'), (3, 'testcase', 'batchCreate'), (3, 'testcase', 'batchEdit'), @@ -1324,6 +1367,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'api', 'getModel'), (4, 'bug', 'activate'), (4, 'bug', 'assignTo'), +(4, 'bug', 'batchAssignTo'), (4, 'bug', 'batchClose'), (4, 'bug', 'batchConfirm'), (4, 'bug', 'batchCreate'), @@ -1343,9 +1387,15 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'bug', 'resolve'), (4, 'bug', 'saveTemplate'), (4, 'bug', 'view'), +(4, 'build', 'batchUnlinkBug'), +(4, 'build', 'batchUnlinkStory'), (4, 'build', 'create'), (4, 'build', 'delete'), (4, 'build', 'edit'), +(4, 'build', 'linkBug'), +(4, 'build', 'linkStory'), +(4, 'build', 'unlinkBug'), +(4, 'build', 'unlinkStory'), (4, 'build', 'view'), (4, 'company', 'browse'), (4, 'company', 'dynamic'), @@ -1366,6 +1416,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'file', 'delete'), (4, 'file', 'download'), (4, 'file', 'edit'), +(4, 'file', 'uploadImages'), (4, 'git', 'apiSync'), (4, 'git', 'cat'), (4, 'git', 'diff'), @@ -1395,6 +1446,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'productplan', 'view'), (4, 'project', 'activate'), (4, 'project', 'batchedit'), +(4, 'project', 'batchUnlinkStory'), (4, 'project', 'browse'), (4, 'project', 'bug'), (4, 'project', 'build'), @@ -1450,6 +1502,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'svn', 'diff'), (4, 'task', 'activate'), (4, 'task', 'assignTo'), +(4, 'task', 'batchAssignTo'), (4, 'task', 'batchClose'), (4, 'task', 'batchCreate'), (4, 'task', 'batchEdit'), @@ -1466,8 +1519,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'task', 'pause'), (4, 'task', 'recordEstimate'), (4, 'task', 'report'), -(4, 'task', 'start'), (4, 'task', 'restart'), +(4, 'task', 'start'), (4, 'task', 'view'), (4, 'testcase', 'browse'), (4, 'testcase', 'createBug'), @@ -1522,6 +1575,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'api', 'getModel'), (5, 'bug', 'activate'), (5, 'bug', 'assignTo'), +(5, 'bug', 'batchAssignTo'), (5, 'bug', 'batchClose'), (5, 'bug', 'batchConfirm'), (5, 'bug', 'batchCreate'), @@ -1560,6 +1614,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'file', 'delete'), (5, 'file', 'download'), (5, 'file', 'edit'), +(5, 'file', 'uploadImages'), (5, 'git', 'apiSync'), (5, 'git', 'cat'), (5, 'git', 'diff'), @@ -1602,29 +1657,51 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'productplan', 'unlinkBug'), (5, 'productplan', 'unlinkStory'), (5, 'productplan', 'view'), +(5, 'project', 'activate'), +(5, 'project', 'batchedit'), +(5, 'project', 'batchUnlinkStory'), (5, 'project', 'browse'), (5, 'project', 'bug'), (5, 'project', 'build'), (5, 'project', 'burn'), (5, 'project', 'burnData'), +(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', 'index'), (5, 'project', 'linkStory'), +(5, 'project', 'manageMembers'), (5, 'project', 'manageProducts'), +(5, 'project', 'order'), +(5, 'project', 'putoff'), +(5, 'project', 'start'), (5, 'project', 'story'), +(5, 'project', 'suspend'), (5, 'project', 'task'), (5, 'project', 'team'), (5, 'project', 'testtask'), +(5, 'project', 'unlinkMember'), (5, 'project', 'unlinkStory'), (5, 'project', 'view'), (5, 'qa', 'index'), +(5, 'release', 'batchUnlinkBug'), +(5, 'release', 'batchUnlinkStory'), (5, 'release', 'browse'), (5, 'release', 'create'), (5, 'release', 'delete'), (5, 'release', 'edit'), (5, 'release', 'export'), +(5, 'release', 'linkBug'), +(5, 'release', 'linkStory'), +(5, 'release', 'unlinkBug'), +(5, 'release', 'unlinkStory'), (5, 'release', 'view'), (5, 'report', 'bugAssign'), (5, 'report', 'bugSummary'), @@ -1715,6 +1792,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'api', 'getModel'), (6, 'bug', 'activate'), (6, 'bug', 'assignTo'), +(6, 'bug', 'batchAssignTo'), (6, 'bug', 'batchClose'), (6, 'bug', 'batchConfirm'), (6, 'bug', 'batchCreate'), @@ -1734,9 +1812,15 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'bug', 'resolve'), (6, 'bug', 'saveTemplate'), (6, 'bug', 'view'), +(6, 'build', 'batchUnlinkBug'), +(6, 'build', 'batchUnlinkStory'), (6, 'build', 'create'), (6, 'build', 'delete'), (6, 'build', 'edit'), +(6, 'build', 'linkBug'), +(6, 'build', 'linkStory'), +(6, 'build', 'unlinkBug'), +(6, 'build', 'unlinkStory'), (6, 'build', 'view'), (6, 'company', 'browse'), (6, 'company', 'dynamic'), @@ -1757,6 +1841,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'file', 'delete'), (6, 'file', 'download'), (6, 'file', 'edit'), +(6, 'file', 'uploadImages'), (6, 'git', 'apiSync'), (6, 'git', 'cat'), (6, 'git', 'diff'), @@ -1786,6 +1871,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'productplan', 'view'), (6, 'project', 'activate'), (6, 'project', 'batchedit'), +(6, 'project', 'batchUnlinkStory'), (6, 'project', 'browse'), (6, 'project', 'bug'), (6, 'project', 'build'), @@ -1841,6 +1927,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'svn', 'diff'), (6, 'task', 'activate'), (6, 'task', 'assignTo'), +(6, 'task', 'batchAssignTo'), (6, 'task', 'batchClose'), (6, 'task', 'batchCreate'), (6, 'task', 'batchEdit'), @@ -1857,8 +1944,8 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'task', 'pause'), (6, 'task', 'recordEstimate'), (6, 'task', 'report'), -(6, 'task', 'start'), (6, 'task', 'restart'), +(6, 'task', 'start'), (6, 'task', 'view'), (6, 'testcase', 'browse'), (6, 'testcase', 'export'), @@ -1950,6 +2037,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'file', 'delete'), (7, 'file', 'download'), (7, 'file', 'edit'), +(7, 'file', 'uploadImages'), (7, 'git', 'apiSync'), (7, 'git', 'cat'), (7, 'git', 'diff'), @@ -2010,11 +2098,17 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'project', 'unlinkStory'), (7, 'project', 'view'), (7, 'qa', 'index'), +(7, 'release', 'batchUnlinkBug'), +(7, 'release', 'batchUnlinkStory'), (7, 'release', 'browse'), (7, 'release', 'create'), (7, 'release', 'delete'), (7, 'release', 'edit'), (7, 'release', 'export'), +(7, 'release', 'linkBug'), +(7, 'release', 'linkStory'), +(7, 'release', 'unlinkBug'), +(7, 'release', 'unlinkStory'), (7, 'release', 'view'), (7, 'report', 'bugAssign'), (7, 'report', 'bugSummary'), @@ -2028,6 +2122,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'search', 'saveQuery'), (7, 'search', 'select'), (7, 'story', 'activate'), +(7, 'story', 'batchAssignTo'), (7, 'story', 'batchChangePlan'), (7, 'story', 'batchChangeStage'), (7, 'story', 'batchClose'), @@ -2105,6 +2200,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'api', 'getModel'), (8, 'bug', 'activate'), (8, 'bug', 'assignTo'), +(8, 'bug', 'batchAssignTo'), (8, 'bug', 'batchClose'), (8, 'bug', 'batchConfirm'), (8, 'bug', 'batchCreate'), @@ -2147,6 +2243,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'file', 'delete'), (8, 'file', 'download'), (8, 'file', 'edit'), +(8, 'file', 'uploadImages'), (8, 'git', 'apiSync'), (8, 'git', 'cat'), (8, 'git', 'diff'), @@ -2214,6 +2311,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'svn', 'diff'), (8, 'task', 'activate'), (8, 'task', 'assignTo'), +(8, 'task', 'batchAssignTo'), (8, 'task', 'batchClose'), (8, 'task', 'batchCreate'), (8, 'task', 'batchEdit'), @@ -2230,10 +2328,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'task', 'pause'), (8, 'task', 'recordEstimate'), (8, 'task', 'report'), -(8, 'task', 'start'), (8, 'task', 'restart'), +(8, 'task', 'start'), (8, 'task', 'view'), (8, 'testcase', 'batchCreate'), +(8, 'testcase', 'batchDelete'), (8, 'testcase', 'batchEdit'), (8, 'testcase', 'browse'), (8, 'testcase', 'confirmChange'), @@ -2331,6 +2430,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'file', 'delete'), (9, 'file', 'download'), (9, 'file', 'edit'), +(9, 'file', 'uploadImages'), (9, 'git', 'apiSync'), (9, 'git', 'cat'), (9, 'git', 'diff'), @@ -2423,8 +2523,15 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'todo', 'finish'), (9, 'todo', 'import2Today'), (9, 'todo', 'view'), +(9, 'user', 'batchCreate'), +(9, 'user', 'batchEdit'), (9, 'user', 'bug'), +(9, 'user', 'create'), +(9, 'user', 'delete'), +(9, 'user', 'deleteContacts'), (9, 'user', 'dynamic'), +(9, 'user', 'edit'), +(9, 'user', 'manageContacts'), (9, 'user', 'profile'), (9, 'user', 'project'), (9, 'user', 'story'), @@ -2432,169 +2539,170 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'user', 'testCase'), (9, 'user', 'testTask'), (9, 'user', 'todo'), +(9, 'user', 'unlock'), (9, 'user', 'view'), -(10,'action', 'editComment'), -(10,'api', 'getModel'), -(10,'bug', 'activate'), -(10,'bug', 'browse'), -(10,'bug', 'close'), -(10,'bug', 'create'), -(10,'bug', 'edit'), -(10,'bug', 'index'), -(10,'bug', 'report'), -(10,'bug', 'view'), -(10,'build', 'view'), -(10,'company', 'browse'), -(10,'company', 'dynamic'), -(10,'company', 'index'), -(10,'company', 'view'), -(10,'doc', 'browse'), -(10,'doc', 'index'), -(10,'doc', 'view'), -(10,'file', 'download'), -(10,'index', 'index'), -(10,'misc', 'ping'), -(10,'my', 'changePassword'), -(10,'my', 'dynamic'), -(10,'my', 'editProfile'), -(10,'my', 'index'), -(10,'my', 'profile'), -(10,'my', 'task'), -(10,'my', 'todo'), -(10,'product', 'browse'), -(10,'product', 'doc'), -(10,'product', 'dynamic'), -(10,'product', 'index'), -(10,'product', 'roadmap'), -(10,'product', 'view'), -(10,'productplan', 'browse'), -(10,'productplan', 'view'), -(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', 'story'), -(10,'project', 'task'), -(10,'project', 'team'), -(10,'project', 'testtask'), -(10,'project', 'view'), -(10,'qa', 'index'), -(10,'release', 'browse'), -(10,'release', 'view'), -(10,'report', 'bugAssign'), -(10,'report', 'bugSummary'), -(10,'report', 'index'), -(10,'report', 'productInfo'), -(10,'report', 'projectDeviation'), -(10,'report', 'workload'), -(10,'search', 'buildForm'), -(10,'search', 'buildQuery'), -(10,'search', 'deleteQuery'), -(10,'search', 'saveQuery'), -(10,'story', 'tasks'), -(10,'story', 'view'), -(10,'task', 'deleteEstimate'), -(10,'task', 'editEstimate'), -(10,'task', 'recordEstimate'), -(10,'task', 'view'), -(10,'todo', 'batchCreate'), -(10,'todo', 'batchEdit'), -(10,'todo', 'batchFinish'), -(10,'todo', 'create'), -(10,'todo', 'delete'), -(10,'todo', 'edit'), -(10,'todo', 'export'), -(10,'todo', 'finish'), -(10,'todo', 'import2Today'), -(10,'todo', 'view'), -(10,'user', 'bug'), -(10,'user', 'dynamic'), -(10,'user', 'profile'), -(10,'user', 'project'), -(10,'user', 'story'), -(10,'user', 'task'), -(10,'user', 'testCase'), -(10,'user', 'testTask'), -(10,'user', 'todo'), -(10,'user', 'view'), -(11,'bug', 'browse'), -(11,'bug', 'index'), -(11,'bug', 'report'), -(11,'bug', 'view'), -(11,'build', 'view'), -(11,'company', 'browse'), -(11,'company', 'dynamic'), -(11,'company', 'index'), -(11,'company', 'view'), -(11,'doc', 'browse'), -(11,'doc', 'index'), -(11,'doc', 'view'), -(11,'file', 'download'), -(11,'git', 'cat'), -(11,'git', 'diff'), -(11,'group', 'browse'), -(11,'index', 'index'), -(11,'misc', 'ping'), -(11,'my', 'index'), -(11,'product', 'browse'), -(11,'product', 'doc'), -(11,'product', 'dynamic'), -(11,'product', 'index'), -(11,'product', 'roadmap'), -(11,'product', 'view'), -(11,'productplan', 'browse'), -(11,'productplan', 'view'), -(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', 'story'), -(11,'project', 'task'), -(11,'project', 'team'), -(11,'project', 'testtask'), -(11,'project', 'view'), -(11,'qa', 'index'), -(11,'release', 'browse'), -(11,'release', 'view'), -(11,'report', 'bugAssign'), -(11,'report', 'bugSummary'), -(11,'report', 'index'), -(11,'report', 'productInfo'), -(11,'report', 'projectDeviation'), -(11,'report', 'workload'), -(11,'search', 'buildForm'), -(11,'search', 'buildQuery'), -(11,'story', 'tasks'), -(11,'story', 'view'), -(11,'svn', 'cat'), -(11,'svn', 'diff'), -(11,'task', 'recordEstimate'), -(11,'task', 'view'), -(11,'testcase', 'browse'), -(11,'testcase', 'groupCase'), -(11,'testcase', 'index'), -(11,'testcase', 'view'), -(11,'testtask', 'browse'), -(11,'testtask', 'cases'), -(11,'testtask', 'groupCase'), -(11,'testtask', 'index'), -(11,'testtask', 'results'), -(11,'testtask', 'view'), -(11,'user', 'bug'), -(11,'user', 'dynamic'), -(11,'user', 'profile'), -(11,'user', 'project'), -(11,'user', 'story'), -(11,'user', 'task'), -(11,'user', 'testCase'), -(11,'user', 'testTask'), -(11,'user', 'todo'), -(11,'user', 'view'); +(10, 'action', 'editComment'), +(10, 'api', 'getModel'), +(10, 'bug', 'activate'), +(10, 'bug', 'browse'), +(10, 'bug', 'close'), +(10, 'bug', 'create'), +(10, 'bug', 'edit'), +(10, 'bug', 'index'), +(10, 'bug', 'report'), +(10, 'bug', 'view'), +(10, 'build', 'view'), +(10, 'company', 'browse'), +(10, 'company', 'dynamic'), +(10, 'company', 'index'), +(10, 'company', 'view'), +(10, 'doc', 'browse'), +(10, 'doc', 'index'), +(10, 'doc', 'view'), +(10, 'file', 'download'), +(10, 'index', 'index'), +(10, 'misc', 'ping'), +(10, 'my', 'changePassword'), +(10, 'my', 'dynamic'), +(10, 'my', 'editProfile'), +(10, 'my', 'index'), +(10, 'my', 'profile'), +(10, 'my', 'task'), +(10, 'my', 'todo'), +(10, 'product', 'browse'), +(10, 'product', 'doc'), +(10, 'product', 'dynamic'), +(10, 'product', 'index'), +(10, 'product', 'roadmap'), +(10, 'product', 'view'), +(10, 'productplan', 'browse'), +(10, 'productplan', 'view'), +(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', 'story'), +(10, 'project', 'task'), +(10, 'project', 'team'), +(10, 'project', 'testtask'), +(10, 'project', 'view'), +(10, 'qa', 'index'), +(10, 'release', 'browse'), +(10, 'release', 'view'), +(10, 'report', 'bugAssign'), +(10, 'report', 'bugSummary'), +(10, 'report', 'index'), +(10, 'report', 'productInfo'), +(10, 'report', 'projectDeviation'), +(10, 'report', 'workload'), +(10, 'search', 'buildForm'), +(10, 'search', 'buildQuery'), +(10, 'search', 'deleteQuery'), +(10, 'search', 'saveQuery'), +(10, 'story', 'tasks'), +(10, 'story', 'view'), +(10, 'task', 'deleteEstimate'), +(10, 'task', 'editEstimate'), +(10, 'task', 'recordEstimate'), +(10, 'task', 'view'), +(10, 'todo', 'batchCreate'), +(10, 'todo', 'batchEdit'), +(10, 'todo', 'batchFinish'), +(10, 'todo', 'create'), +(10, 'todo', 'delete'), +(10, 'todo', 'edit'), +(10, 'todo', 'export'), +(10, 'todo', 'finish'), +(10, 'todo', 'import2Today'), +(10, 'todo', 'view'), +(10, 'user', 'bug'), +(10, 'user', 'dynamic'), +(10, 'user', 'profile'), +(10, 'user', 'project'), +(10, 'user', 'story'), +(10, 'user', 'task'), +(10, 'user', 'testCase'), +(10, 'user', 'testTask'), +(10, 'user', 'todo'), +(10, 'user', 'view'), +(11, 'bug', 'browse'), +(11, 'bug', 'index'), +(11, 'bug', 'report'), +(11, 'bug', 'view'), +(11, 'build', 'view'), +(11, 'company', 'browse'), +(11, 'company', 'dynamic'), +(11, 'company', 'index'), +(11, 'company', 'view'), +(11, 'doc', 'browse'), +(11, 'doc', 'index'), +(11, 'doc', 'view'), +(11, 'file', 'download'), +(11, 'git', 'cat'), +(11, 'git', 'diff'), +(11, 'group', 'browse'), +(11, 'index', 'index'), +(11, 'misc', 'ping'), +(11, 'my', 'index'), +(11, 'product', 'browse'), +(11, 'product', 'doc'), +(11, 'product', 'dynamic'), +(11, 'product', 'index'), +(11, 'product', 'roadmap'), +(11, 'product', 'view'), +(11, 'productplan', 'browse'), +(11, 'productplan', 'view'), +(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', 'story'), +(11, 'project', 'task'), +(11, 'project', 'team'), +(11, 'project', 'testtask'), +(11, 'project', 'view'), +(11, 'qa', 'index'), +(11, 'release', 'browse'), +(11, 'release', 'view'), +(11, 'report', 'bugAssign'), +(11, 'report', 'bugSummary'), +(11, 'report', 'index'), +(11, 'report', 'productInfo'), +(11, 'report', 'projectDeviation'), +(11, 'report', 'workload'), +(11, 'search', 'buildForm'), +(11, 'search', 'buildQuery'), +(11, 'story', 'tasks'), +(11, 'story', 'view'), +(11, 'svn', 'cat'), +(11, 'svn', 'diff'), +(11, 'task', 'recordEstimate'), +(11, 'task', 'view'), +(11, 'testcase', 'browse'), +(11, 'testcase', 'groupCase'), +(11, 'testcase', 'index'), +(11, 'testcase', 'view'), +(11, 'testtask', 'browse'), +(11, 'testtask', 'cases'), +(11, 'testtask', 'groupCase'), +(11, 'testtask', 'index'), +(11, 'testtask', 'results'), +(11, 'testtask', 'view'), +(11, 'user', 'bug'), +(11, 'user', 'dynamic'), +(11, 'user', 'profile'), +(11, 'user', 'project'), +(11, 'user', 'story'), +(11, 'user', 'task'), +(11, 'user', 'testCase'), +(11, 'user', 'testTask'), +(11, 'user', 'todo'), +(11, 'user', 'view'); diff --git a/module/install/view/step5.html.php b/module/install/view/step5.html.php index a789ac1f06..eafa8cb1d8 100644 --- a/module/install/view/step5.html.php +++ b/module/install/view/step5.html.php @@ -25,7 +25,7 @@ install->register, '_blank', "class='btn btn-success'"); echo "   " . $lang->install->or . '   '; - echo html::a($this->createLink('index'), $lang->install->login, '', "class='btn btn-primary'"); + echo html::a('index.php', $lang->install->login, '', "class='btn btn-primary'"); ?> diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index 0487ccf2dd..3e237d31ae 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -23,7 +23,7 @@ include '../../common/view/header.lite.html.php'; - +