diff --git a/db/update20.0.beta3.sql b/db/update20.0.beta3.sql index 1d661f0a21..2bc2d9b52d 100644 --- a/db/update20.0.beta3.sql +++ b/db/update20.0.beta3.sql @@ -7,6 +7,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'my', 'preference'), (1, 'my', 'uploadAvatar'), (1, 'user', 'cropAvatar'), +(1, 'program', 'PRJView'), (2, 'product', 'dashboard'), (2, 'projectstory', 'story'), (2, 'projectstory', 'track'), @@ -25,6 +26,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'my', 'preference'), (4, 'my', 'uploadAvatar'), (4, 'user', 'cropAvatar'), +(4, 'program', 'PRJView'), (5, 'product', 'dashboard'), (5, 'projectstory', 'story'), (5, 'projectstory', 'track'), @@ -33,12 +35,14 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'my', 'preference'), (5, 'my', 'uploadAvatar'), (5, 'user', 'cropAvatar'), +(5, 'program', 'PRJView'), (6, 'product', 'dashboard'), (6, 'projectstory', 'story'), (6, 'projectstory', 'track'), (6, 'my', 'preference'), (6, 'my', 'uploadAvatar'), (6, 'user', 'cropAvatar'), +(6, 'program', 'PRJView'), (7, 'product', 'dashboard'), (7, 'projectstory', 'story'), (7, 'projectstory', 'track'), @@ -47,12 +51,14 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'my', 'preference'), (7, 'my', 'uploadAvatar'), (7, 'user', 'cropAvatar'), +(7, 'program', 'PRJView'), (8, 'product', 'dashboard'), (8, 'projectstory', 'story'), (8, 'projectstory', 'track'), (8, 'my', 'preference'), (8, 'my', 'uploadAvatar'), (8, 'user', 'cropAvatar'), +(8, 'program', 'PRJView'), (9, 'product', 'dashboard'), (9, 'projectstory', 'story'), (9, 'projectstory', 'track'), @@ -61,6 +67,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'my', 'preference'), (9, 'my', 'uploadAvatar'), (9, 'user', 'cropAvatar'), +(9, 'program', 'PRJView'), (10, 'product', 'dashboard'), (10, 'projectstory', 'story'), (10, 'projectstory', 'track'), diff --git a/db/zentao.sql b/db/zentao.sql index 06c2f3b81e..1fe78155a6 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1710,6 +1710,43 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'productplan', 'unlinkBug'), (1, 'productplan', 'unlinkStory'), (1, 'productplan', 'view'), +(1, 'program', 'createGuide'), +(1, 'program', 'PGMBrowse'), +(1, 'program', 'PGMProduct'), +(1, 'program', 'PGMCreate'), +(1, 'program', 'PGMEdit'), +(1, 'program', 'PGMStart'), +(1, 'program', 'PGMSuspend'), +(1, 'program', 'PGMActivate'), +(1, 'program', 'PGMClose'), +(1, 'program', 'PGMDelete'), +(1, 'program', 'PGMProject'), +(1, 'program', 'PGMStakeholder'), +(1, 'program', 'createStakeholder'), +(1, 'program', 'unlinkStakeholder'), +(1, 'program', 'index'), +(1, 'program', 'PRJBrowse'), +(1, 'program', 'PRJProgramTitle'), +(1, 'program', 'PRJCreate'), +(1, 'program', 'PRJEdit'), +(1, 'program', 'PRJGroup'), +(1, 'program', 'PRJCreateGroup'), +(1, 'program', 'PRJManageView'), +(1, 'program', 'PRJManagePriv'), +(1, 'program', 'PRJManageMembers'), +(1, 'program', 'PRJManageGroupMember'), +(1, 'program', 'PRJCopyGroup'), +(1, 'program', 'PRJEditGroup'), +(1, 'program', 'PRJStart'), +(1, 'program', 'PRJSuspend'), +(1, 'program', 'PRJClose'), +(1, 'program', 'PRJActivate'), +(1, 'program', 'PRJDelete'), +(1, 'program', 'PRJView'), +(1, 'program', 'PRJWhitelist'), +(1, 'program', 'PRJAddWhitelist'), +(1, 'program', 'unbindWhielist'), +(1, 'program', 'PRJManageProducts'), (1, 'program', 'view'), (1, 'project', 'activate'), (1, 'project', 'batchedit'), @@ -2514,6 +2551,44 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'product', 'build'), (4, 'productplan', 'browse'), (4, 'productplan', 'view'), +(4, 'program', 'createGuide'), +(4, 'program', 'PGMBrowse'), +(4, 'program', 'PGMProduct'), +(4, 'program', 'PGMCreate'), +(4, 'program', 'PGMEdit'), +(4, 'program', 'PGMStart'), +(4, 'program', 'PGMSuspend'), +(4, 'program', 'PGMActivate'), +(4, 'program', 'PGMClose'), +(4, 'program', 'PGMDelete'), +(4, 'program', 'PGMProject'), +(4, 'program', 'PGMStakeholder'), +(4, 'program', 'createStakeholder'), +(4, 'program', 'unlinkStakeholder'), +(4, 'program', 'index'), +(4, 'program', 'PRJBrowse'), +(4, 'program', 'PRJProgramTitle'), +(4, 'program', 'PRJCreate'), +(4, 'program', 'PRJEdit'), +(4, 'program', 'PRJGroup'), +(4, 'program', 'PRJCreateGroup'), +(4, 'program', 'PRJManageView'), +(4, 'program', 'PRJManagePriv'), +(4, 'program', 'PRJManageMembers'), +(4, 'program', 'PRJManageGroupMember'), +(4, 'program', 'PRJCopyGroup'), +(4, 'program', 'PRJEditGroup'), +(4, 'program', 'PRJStart'), +(4, 'program', 'PRJSuspend'), +(4, 'program', 'PRJClose'), +(4, 'program', 'PRJActivate'), +(4, 'program', 'PRJDelete'), +(4, 'program', 'PRJView'), +(4, 'program', 'PRJWhitelist'), +(4, 'program', 'PRJAddWhitelist'), +(4, 'program', 'unbindWhielist'), +(4, 'program', 'PRJManageProducts'), +(4, 'program', 'view'), (4, 'project', 'activate'), (4, 'project', 'batchedit'), (4, 'project', 'batchUnlinkStory'), @@ -2777,6 +2852,43 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'product', 'dashboard'), (5, 'product', 'build'), (5, 'product', 'updateOrder'), +(5, 'program', 'createGuide'), +(5, 'program', 'PGMBrowse'), +(5, 'program', 'PGMProduct'), +(5, 'program', 'PGMCreate'), +(5, 'program', 'PGMEdit'), +(5, 'program', 'PGMStart'), +(5, 'program', 'PGMSuspend'), +(5, 'program', 'PGMActivate'), +(5, 'program', 'PGMClose'), +(5, 'program', 'PGMDelete'), +(5, 'program', 'PGMProject'), +(5, 'program', 'PGMStakeholder'), +(5, 'program', 'createStakeholder'), +(5, 'program', 'unlinkStakeholder'), +(5, 'program', 'index'), +(5, 'program', 'PRJBrowse'), +(5, 'program', 'PRJProgramTitle'), +(5, 'program', 'PRJCreate'), +(5, 'program', 'PRJEdit'), +(5, 'program', 'PRJGroup'), +(5, 'program', 'PRJCreateGroup'), +(5, 'program', 'PRJManageView'), +(5, 'program', 'PRJManagePriv'), +(5, 'program', 'PRJManageMembers'), +(5, 'program', 'PRJManageGroupMember'), +(5, 'program', 'PRJCopyGroup'), +(5, 'program', 'PRJEditGroup'), +(5, 'program', 'PRJStart'), +(5, 'program', 'PRJSuspend'), +(5, 'program', 'PRJClose'), +(5, 'program', 'PRJActivate'), +(5, 'program', 'PRJDelete'), +(5, 'program', 'PRJView'), +(5, 'program', 'PRJWhitelist'), +(5, 'program', 'PRJAddWhitelist'), +(5, 'program', 'unbindWhielist'), +(5, 'program', 'PRJManageProducts'), (5, 'branch', 'manage'), (5, 'branch', 'sort'), (5, 'branch', 'delete'), @@ -3073,6 +3185,43 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'product', 'view'), (6, 'product', 'dashboard'), (6, 'product', 'build'), +(6, 'program', 'createGuide'), +(6, 'program', 'PGMBrowse'), +(6, 'program', 'PGMProduct'), +(6, 'program', 'PGMCreate'), +(6, 'program', 'PGMEdit'), +(6, 'program', 'PGMStart'), +(6, 'program', 'PGMSuspend'), +(6, 'program', 'PGMActivate'), +(6, 'program', 'PGMClose'), +(6, 'program', 'PGMDelete'), +(6, 'program', 'PGMProject'), +(6, 'program', 'PGMStakeholder'), +(6, 'program', 'createStakeholder'), +(6, 'program', 'unlinkStakeholder'), +(6, 'program', 'index'), +(6, 'program', 'PRJBrowse'), +(6, 'program', 'PRJProgramTitle'), +(6, 'program', 'PRJCreate'), +(6, 'program', 'PRJEdit'), +(6, 'program', 'PRJGroup'), +(6, 'program', 'PRJCreateGroup'), +(6, 'program', 'PRJManageView'), +(6, 'program', 'PRJManagePriv'), +(6, 'program', 'PRJManageMembers'), +(6, 'program', 'PRJManageGroupMember'), +(6, 'program', 'PRJCopyGroup'), +(6, 'program', 'PRJEditGroup'), +(6, 'program', 'PRJStart'), +(6, 'program', 'PRJSuspend'), +(6, 'program', 'PRJClose'), +(6, 'program', 'PRJActivate'), +(6, 'program', 'PRJDelete'), +(6, 'program', 'PRJView'), +(6, 'program', 'PRJWhitelist'), +(6, 'program', 'PRJAddWhitelist'), +(6, 'program', 'unbindWhielist'), +(6, 'program', 'PRJManageProducts'), (6, 'productplan', 'browse'), (6, 'productplan', 'view'), (6, 'project', 'activate'), @@ -3320,6 +3469,43 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'product', 'dashboard'), (7, 'product', 'build'), (7, 'product', 'updateOrder'), +(7, 'program', 'createGuide'), +(7, 'program', 'PGMBrowse'), +(7, 'program', 'PGMProduct'), +(7, 'program', 'PGMCreate'), +(7, 'program', 'PGMEdit'), +(7, 'program', 'PGMStart'), +(7, 'program', 'PGMSuspend'), +(7, 'program', 'PGMActivate'), +(7, 'program', 'PGMClose'), +(7, 'program', 'PGMDelete'), +(7, 'program', 'PGMProject'), +(7, 'program', 'PGMStakeholder'), +(7, 'program', 'createStakeholder'), +(7, 'program', 'unlinkStakeholder'), +(7, 'program', 'index'), +(7, 'program', 'PRJBrowse'), +(7, 'program', 'PRJProgramTitle'), +(7, 'program', 'PRJCreate'), +(7, 'program', 'PRJEdit'), +(7, 'program', 'PRJGroup'), +(7, 'program', 'PRJCreateGroup'), +(7, 'program', 'PRJManageView'), +(7, 'program', 'PRJManagePriv'), +(7, 'program', 'PRJManageMembers'), +(7, 'program', 'PRJManageGroupMember'), +(7, 'program', 'PRJCopyGroup'), +(7, 'program', 'PRJEditGroup'), +(7, 'program', 'PRJStart'), +(7, 'program', 'PRJSuspend'), +(7, 'program', 'PRJClose'), +(7, 'program', 'PRJActivate'), +(7, 'program', 'PRJDelete'), +(7, 'program', 'PRJView'), +(7, 'program', 'PRJWhitelist'), +(7, 'program', 'PRJAddWhitelist'), +(7, 'program', 'unbindWhielist'), +(7, 'program', 'PRJManageProducts'), (7, 'branch', 'manage'), (7, 'branch', 'sort'), (7, 'branch', 'delete'), @@ -3579,6 +3765,43 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'product', 'view'), (8, 'product', 'dashboard'), (8, 'product', 'build'), +(8, 'program', 'createGuide'), +(8, 'program', 'PGMBrowse'), +(8, 'program', 'PGMProduct'), +(8, 'program', 'PGMCreate'), +(8, 'program', 'PGMEdit'), +(8, 'program', 'PGMStart'), +(8, 'program', 'PGMSuspend'), +(8, 'program', 'PGMActivate'), +(8, 'program', 'PGMClose'), +(8, 'program', 'PGMDelete'), +(8, 'program', 'PGMProject'), +(8, 'program', 'PGMStakeholder'), +(8, 'program', 'createStakeholder'), +(8, 'program', 'unlinkStakeholder'), +(8, 'program', 'index'), +(8, 'program', 'PRJBrowse'), +(8, 'program', 'PRJProgramTitle'), +(8, 'program', 'PRJCreate'), +(8, 'program', 'PRJEdit'), +(8, 'program', 'PRJGroup'), +(8, 'program', 'PRJCreateGroup'), +(8, 'program', 'PRJManageView'), +(8, 'program', 'PRJManagePriv'), +(8, 'program', 'PRJManageMembers'), +(8, 'program', 'PRJManageGroupMember'), +(8, 'program', 'PRJCopyGroup'), +(8, 'program', 'PRJEditGroup'), +(8, 'program', 'PRJStart'), +(8, 'program', 'PRJSuspend'), +(8, 'program', 'PRJClose'), +(8, 'program', 'PRJActivate'), +(8, 'program', 'PRJDelete'), +(8, 'program', 'PRJView'), +(8, 'program', 'PRJWhitelist'), +(8, 'program', 'PRJAddWhitelist'), +(8, 'program', 'unbindWhielist'), +(8, 'program', 'PRJManageProducts'), (8, 'productplan', 'browse'), (8, 'productplan', 'view'), (8, 'project', 'bug'), @@ -3833,6 +4056,43 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'product', 'view'), (9, 'product', 'dashboard'), (9, 'product', 'build'), +(9, 'program', 'createGuide'), +(9, 'program', 'PGMBrowse'), +(9, 'program', 'PGMProduct'), +(9, 'program', 'PGMCreate'), +(9, 'program', 'PGMEdit'), +(9, 'program', 'PGMStart'), +(9, 'program', 'PGMSuspend'), +(9, 'program', 'PGMActivate'), +(9, 'program', 'PGMClose'), +(9, 'program', 'PGMDelete'), +(9, 'program', 'PGMProject'), +(9, 'program', 'PGMStakeholder'), +(9, 'program', 'createStakeholder'), +(9, 'program', 'unlinkStakeholder'), +(9, 'program', 'index'), +(9, 'program', 'PRJBrowse'), +(9, 'program', 'PRJProgramTitle'), +(9, 'program', 'PRJCreate'), +(9, 'program', 'PRJEdit'), +(9, 'program', 'PRJGroup'), +(9, 'program', 'PRJCreateGroup'), +(9, 'program', 'PRJManageView'), +(9, 'program', 'PRJManagePriv'), +(9, 'program', 'PRJManageMembers'), +(9, 'program', 'PRJManageGroupMember'), +(9, 'program', 'PRJCopyGroup'), +(9, 'program', 'PRJEditGroup'), +(9, 'program', 'PRJStart'), +(9, 'program', 'PRJSuspend'), +(9, 'program', 'PRJClose'), +(9, 'program', 'PRJActivate'), +(9, 'program', 'PRJDelete'), +(9, 'program', 'PRJView'), +(9, 'program', 'PRJWhitelist'), +(9, 'program', 'PRJAddWhitelist'), +(9, 'program', 'unbindWhielist'), +(9, 'program', 'PRJManageProducts'), (9, 'productplan', 'browse'), (9, 'productplan', 'view'), (9, 'project', 'browse'), diff --git a/module/stage/control.php b/module/stage/control.php index fefa558edd..6c5aaf02d7 100644 --- a/module/stage/control.php +++ b/module/stage/control.php @@ -18,7 +18,7 @@ class stage extends control * @access public * @return void */ - public function browse($orderBy = "id_desc") + public function browse($orderBy = "id_asc") { $this->view->stages = $this->stage->getStages($orderBy); $this->view->orderBy = $orderBy; diff --git a/module/stage/lang/zh-cn.php b/module/stage/lang/zh-cn.php index 345a156bbe..15980382a7 100644 --- a/module/stage/lang/zh-cn.php +++ b/module/stage/lang/zh-cn.php @@ -22,7 +22,7 @@ $lang->stage->common = '阶段'; $lang->stage->id = '编号'; $lang->stage->name = '阶段名称'; $lang->stage->type = '阶段分类'; -$lang->stage->percent = '工作量比例'; +$lang->stage->percent = '工作量占比'; $lang->stage->setType = '阶段类型'; $lang->stage->typeList['request'] = '需求';