diff --git a/db/zentao.sql b/db/zentao.sql index 9b4c4a8724..427d2a475c 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -863,9 +863,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'doc', 'editLib'), (1, 'doc', 'index'), (1, 'doc', 'allLibs'), +(1, 'doc', 'objectLibs'), (1, 'doc', 'showFiles'), (1, 'doc', 'view'), -(1, 'doc', 'diff'), (1, 'editor', 'delete'), (1, 'editor', 'edit'), (1, 'editor', 'extend'), @@ -1173,9 +1173,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2, 'doc', 'edit'), (2, 'doc', 'index'), (2, 'doc', 'allLibs'), +(2, 'doc', 'objectLibs'), (2, 'doc', 'showFiles'), (2, 'doc', 'view'), -(2, 'doc', 'diff'), (2, 'file', 'download'), (2, 'file', 'edit'), (2, 'git', 'apiSync'), @@ -1343,9 +1343,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3, 'doc', 'edit'), (3, 'doc', 'index'), (3, 'doc', 'allLibs'), +(3, 'doc', 'objectLibs'), (3, 'doc', 'showFiles'), (3, 'doc', 'view'), -(3, 'doc', 'diff'), (3, 'file', 'download'), (3, 'file', 'edit'), (3, 'git', 'apiSync'), @@ -1554,9 +1554,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'doc', 'editLib'), (4, 'doc', 'index'), (4, 'doc', 'allLibs'), +(4, 'doc', 'objectLibs'), (4, 'doc', 'showFiles'), (4, 'doc', 'view'), -(4, 'doc', 'diff'), (4, 'extension', 'browse'), (4, 'extension', 'obtain'), (4, 'extension', 'structure'), @@ -1767,9 +1767,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'doc', 'editLib'), (5, 'doc', 'index'), (5, 'doc', 'allLibs'), +(5, 'doc', 'objectLibs'), (5, 'doc', 'showFiles'), (5, 'doc', 'view'), -(5, 'doc', 'diff'), (5, 'extension', 'browse'), (5, 'extension', 'obtain'), (5, 'extension', 'structure'), @@ -2016,9 +2016,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'doc', 'editLib'), (6, 'doc', 'index'), (6, 'doc', 'allLibs'), +(6, 'doc', 'objectLibs'), (6, 'doc', 'showFiles'), (6, 'doc', 'view'), -(6, 'doc', 'diff'), (6, 'extension', 'browse'), (6, 'extension', 'obtain'), (6, 'extension', 'structure'), @@ -2227,9 +2227,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'doc', 'editLib'), (7, 'doc', 'index'), (7, 'doc', 'allLibs'), +(7, 'doc', 'objectLibs'), (7, 'doc', 'showFiles'), (7, 'doc', 'view'), -(7, 'doc', 'diff'), (7, 'extension', 'browse'), (7, 'extension', 'obtain'), (7, 'extension', 'structure'), @@ -2454,9 +2454,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8, 'doc', 'editLib'), (8, 'doc', 'index'), (8, 'doc', 'allLibs'), +(8, 'doc', 'objectLibs'), (8, 'doc', 'showFiles'), (8, 'doc', 'view'), -(8, 'doc', 'diff'), (8, 'extension', 'browse'), (8, 'extension', 'obtain'), (8, 'extension', 'structure'), @@ -2655,9 +2655,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9, 'doc', 'editLib'), (9, 'doc', 'index'), (9, 'doc', 'allLibs'), +(9, 'doc', 'objectLibs'), (9, 'doc', 'showFiles'), (9, 'doc', 'view'), -(9, 'doc', 'diff'), (9, 'extension', 'browse'), (9, 'extension', 'obtain'), (9, 'extension', 'structure'), @@ -2804,9 +2804,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10, 'doc', 'browse'), (10, 'doc', 'index'), (10, 'doc', 'allLibs'), +(10, 'doc', 'objectLibs'), (10, 'doc', 'showFiles'), (10, 'doc', 'view'), -(10, 'doc', 'diff'), (10, 'file', 'download'), (10, 'index', 'index'), (10, 'misc', 'ping'), @@ -2894,9 +2894,9 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11, 'doc', 'browse'), (11, 'doc', 'index'), (11, 'doc', 'allLibs'), +(11, 'doc', 'objectLibs'), (11, 'doc', 'showFiles'), (11, 'doc', 'view'), -(11, 'doc', 'diff'), (11, 'file', 'download'), (11, 'git', 'cat'), (11, 'git', 'diff'), diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index d6b60edcb9..8b6ca0ab42 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -56,6 +56,7 @@ $lang->doc->libType = 'Library type'; $lang->doc->custom = 'Custom library'; $lang->doc->createLib = 'Create library'; $lang->doc->allLibs = 'Browse library'; +$lang->doc->objectLibs = "Browse {$lang->productCommon}/{$lang->projectCommon} library"; $lang->doc->showFiles = 'File library'; $lang->doc->editLib = 'Edit library'; $lang->doc->deleteLib = 'Delete library'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 8b50130fea..2310453545 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -60,6 +60,7 @@ $lang->doc->libType = '文档库类型'; $lang->doc->custom = '自定义文档库'; $lang->doc->createLib = '创建文档库'; $lang->doc->allLibs = '文档库列表'; +$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon}库列表"; $lang->doc->showFiles = '附件库'; $lang->doc->editLib = '编辑文档库'; $lang->doc->deleteLib = '删除文档库'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 68532eadd5..8f2c52763e 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -563,18 +563,19 @@ $lang->testtask->methodOrder[70] = 'results'; /* Doc. */ $lang->resource->doc = new stdclass(); -$lang->resource->doc->index = 'index'; -$lang->resource->doc->browse = 'browse'; -$lang->resource->doc->createLib = 'createLib'; -$lang->resource->doc->editLib = 'editLib'; -$lang->resource->doc->deleteLib = 'deleteLib'; -$lang->resource->doc->create = 'create'; -$lang->resource->doc->view = 'view'; -$lang->resource->doc->edit = 'edit'; -$lang->resource->doc->delete = 'delete'; -$lang->resource->doc->allLibs = 'allLibs'; -$lang->resource->doc->showFiles = 'showFiles'; -$lang->resource->doc->diff = 'diff'; +$lang->resource->doc->index = 'index'; +$lang->resource->doc->browse = 'browse'; +$lang->resource->doc->createLib = 'createLib'; +$lang->resource->doc->editLib = 'editLib'; +$lang->resource->doc->deleteLib = 'deleteLib'; +$lang->resource->doc->create = 'create'; +$lang->resource->doc->view = 'view'; +$lang->resource->doc->edit = 'edit'; +$lang->resource->doc->delete = 'delete'; +$lang->resource->doc->allLibs = 'allLibs'; +$lang->resource->doc->objectLibs = 'objectLibs'; +$lang->resource->doc->showFiles = 'showFiles'; +//$lang->resource->doc->diff = 'diff'; $lang->doc->methodOrder[0] = 'index'; $lang->doc->methodOrder[5] = 'browse'; @@ -587,7 +588,8 @@ $lang->doc->methodOrder[35] = 'edit'; $lang->doc->methodOrder[40] = 'delete'; $lang->doc->methodOrder[45] = 'allLibs'; $lang->doc->methodOrder[50] = 'showFiles'; -$lang->doc->methodOrder[55] = 'diff'; +$lang->doc->methodOrder[55] = 'objectLibs'; +//$lang->doc->methodOrder[55] = 'diff'; /* mail. */ $lang->resource->mail = new stdclass(); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 0602e39b6d..5249defae9 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -1366,7 +1366,7 @@ class upgradeModel extends model $data->method = 'showFiles'; $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec(); - $data->method = 'diff'; + $data->method = 'objectLibs'; $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec(); } return true;