From 017b7e3d6c2b60d136dcb4ba350cc61169c87be4 Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 6 Mar 2023 15:02:33 +0800 Subject: [PATCH 001/347] * Adjust code for task #86259 --- module/group/control.php | 11 +++++++++++ module/group/lang/de.php | 1 + module/group/lang/en.php | 1 + module/group/lang/fr.php | 1 + module/group/lang/resource.php | 1 + module/group/lang/vi.php | 1 + module/group/lang/zh-cn.php | 1 + module/group/view/browse.html.php | 1 + module/group/view/permissionedit.html.php | 21 +++++++++++++++++++++ 9 files changed, 39 insertions(+) create mode 100644 module/group/view/permissionedit.html.php diff --git a/module/group/control.php b/module/group/control.php index 7042afe005..6f6d1a8546 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -380,4 +380,15 @@ class group extends control return print(js::locate($this->createLink('group', 'browse'), 'parent')); } } + + /** + * edit permission. + * + * @access public + * @return void + */ + public function permissionedit() + { + $this->display(); + } } diff --git a/module/group/lang/de.php b/module/group/lang/de.php index c32d2444c1..da4a125cfc 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -23,6 +23,7 @@ $lang->group->byModuleTips = '(SHIFT/STRG für Multi-Se $lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.'; $lang->group->manageMember = 'Mitglieder'; $lang->group->manageProjectAdmin = 'Manage Program Admins'; +$lang->group->permissionedit = 'Permission Edit'; $lang->group->confirmDelete = "Do you want to delete '%s'?"; $lang->group->successSaved = 'Gespeichert!'; $lang->group->errorNotSaved = 'Fehlgeschlagen. Bitte aktion und Gruppe wählen.'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index aece3f3e5a..0528884d38 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -23,6 +23,7 @@ $lang->group->byModuleTips = '(Press Shift/Ctrl to Mult $lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.'; $lang->group->manageMember = 'Manage Members'; $lang->group->manageProjectAdmin = 'Manage Program Admins'; +$lang->group->permissionedit = 'Permission Edit'; $lang->group->confirmDelete = "Do you want to delete '%s'?"; $lang->group->successSaved = 'Saved.'; $lang->group->errorNotSaved = 'Failed. Please select actions and groups.'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 601728e9a3..9c56cc8cb7 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -23,6 +23,7 @@ $lang->group->byModuleTips = '(Shift/Ctrl pour sélecti $lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.'; $lang->group->manageMember = 'Gérer Membres'; $lang->group->manageProjectAdmin = 'Manage Program Admins'; +$lang->group->permissionedit = 'Permission Edit'; $lang->group->confirmDelete = "Voulez - vous supprimer '%s'?"; $lang->group->successSaved = 'Sauvé.'; $lang->group->errorNotSaved = 'Echec. Veuillez sélectionner actions et groupes.'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index c6562c3c96..f7db9aab93 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1693,6 +1693,7 @@ $lang->resource->group->manageView = 'manageView'; $lang->resource->group->managePriv = 'managePriv'; $lang->resource->group->manageMember = 'manageMember'; $lang->resource->group->manageProjectAdmin = 'manageProjectAdmin'; +$lang->resource->group->permissionedit = 'permissionedit'; $lang->group->methodOrder[5] = 'browse'; $lang->group->methodOrder[10] = 'create'; diff --git a/module/group/lang/vi.php b/module/group/lang/vi.php index bf9035976d..ed5239639e 100644 --- a/module/group/lang/vi.php +++ b/module/group/lang/vi.php @@ -22,6 +22,7 @@ $lang->group->managePrivByModule = 'Quản lý Privileges by Module'; $lang->group->byModuleTips = '(Press Shift/Ctrl to Multi-select)'; $lang->group->manageMember = 'Quản lý Members'; $lang->group->manageProjectAdmin = 'Manage Program Admins'; +$lang->group->permissionedit = 'Permission Edit'; $lang->group->confirmDelete = 'Bạn có muốn xóa người dùng này group?'; $lang->group->successSaved = 'Đã lưu.'; $lang->group->errorNotSaved = 'Thất bại. Vui lòng select actions and groups.'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 4ffe9a880f..7a6d0abdb8 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -23,6 +23,7 @@ $lang->group->byModuleTips = '(可以按住Shift或 $lang->group->allTips = '勾选此项后,管理员可管理系统中所有对象,包括后续创建的对象。'; $lang->group->manageMember = '成员维护'; $lang->group->manageProjectAdmin = '维护项目管理员'; +$lang->group->permissionedit = '权限编辑'; $lang->group->confirmDelete = '您确定删除“%s”用户分组吗?'; $lang->group->successSaved = '成功保存'; $lang->group->errorNotSaved = '没有保存,请确认选择了权限数据。'; diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index 2d9f7f4474..db9f59be64 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -18,6 +18,7 @@ group->browse;?>
+ createLink('group', 'permissionedit', '', '', false), '', '', 'class="btn btn-link"');?> createLink('group', 'managePriv', 'type=byModule', '', true), $lang->group->managePrivByModule, '', 'class="btn btn-link iframe"');?> createLink('group', 'create', '', '', true), ' ' . $lang->group->create, '', 'class="btn btn-primary iframe" data-width="550"');?>
diff --git a/module/group/view/permissionedit.html.php b/module/group/view/permissionedit.html.php new file mode 100644 index 0000000000..bf6dbdd2ba --- /dev/null +++ b/module/group/view/permissionedit.html.php @@ -0,0 +1,21 @@ + + * @package group + * @version $Id: browse.html.php 4769 2013-05-05 07:24:21Z wwccss $ + * @link http://www.zentao.net + */ +?> + +
+ createLink('group', 'browse', '', '', false), $lang->logout, '', 'class="btn btn-primary"');?> +
+ +
+
+ + From 9afafe3c18cafcf9303a6500d844a274e499f37c Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 6 Mar 2023 16:39:37 +0800 Subject: [PATCH 002/347] * Adjust code for task #86259 . --- module/group/control.php | 1 + module/group/lang/resource.php | 1 + module/group/lang/zh-cn.php | 2 +- module/group/view/browse.html.php | 2 +- module/group/view/permissionedit.html.php | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/module/group/control.php b/module/group/control.php index 6f6d1a8546..5d8d6a4e9a 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -389,6 +389,7 @@ class group extends control */ public function permissionedit() { + $this->view->title = $this->lang->group->permissionedit; $this->display(); } } diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index f7db9aab93..5a29fa1b4d 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1703,6 +1703,7 @@ $lang->group->methodOrder[25] = 'delete'; $lang->group->methodOrder[30] = 'managePriv'; $lang->group->methodOrder[35] = 'manageMember'; $lang->group->methodOrder[40] = 'manageProjectAdmin'; +$lang->group->methodOrder[45] = 'permissionedit'; /* User. */ $lang->resource->user = new stdclass(); diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 7a6d0abdb8..de9aafaa8d 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -23,7 +23,7 @@ $lang->group->byModuleTips = '(可以按住Shift或 $lang->group->allTips = '勾选此项后,管理员可管理系统中所有对象,包括后续创建的对象。'; $lang->group->manageMember = '成员维护'; $lang->group->manageProjectAdmin = '维护项目管理员'; -$lang->group->permissionedit = '权限编辑'; +$lang->group->permissionedit = '维护权限'; $lang->group->confirmDelete = '您确定删除“%s”用户分组吗?'; $lang->group->successSaved = '成功保存'; $lang->group->errorNotSaved = '没有保存,请确认选择了权限数据。'; diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index db9f59be64..0b8aceb0c9 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -18,7 +18,7 @@ group->browse;?>
- createLink('group', 'permissionedit', '', '', false), '', '', 'class="btn btn-link"');?> + createLink('group', 'permissionedit', '', '', false), '' . $lang->group->permissionedit, '', 'class="btn btn-link"');?> createLink('group', 'managePriv', 'type=byModule', '', true), $lang->group->managePrivByModule, '', 'class="btn btn-link iframe"');?> createLink('group', 'create', '', '', true), ' ' . $lang->group->create, '', 'class="btn btn-primary iframe" data-width="550"');?>
diff --git a/module/group/view/permissionedit.html.php b/module/group/view/permissionedit.html.php index bf6dbdd2ba..938a9366d3 100644 --- a/module/group/view/permissionedit.html.php +++ b/module/group/view/permissionedit.html.php @@ -12,7 +12,7 @@ ?>
- createLink('group', 'browse', '', '', false), $lang->logout, '', 'class="btn btn-primary"');?> +
From 624e0300c306cb5d37cdde8173ffd3c6614b6a0a Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 6 Mar 2023 16:47:23 +0800 Subject: [PATCH 003/347] * Code for task #86359. --- module/group/view/permissionedit.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/view/permissionedit.html.php b/module/group/view/permissionedit.html.php index 938a9366d3..766267d28f 100644 --- a/module/group/view/permissionedit.html.php +++ b/module/group/view/permissionedit.html.php @@ -12,7 +12,7 @@ ?>
- + logout, '', 'btn-primary');?>
From 58e3f44f15ecbb9a92ef58c0d96ec1996523c28f Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 7 Mar 2023 01:19:08 +0000 Subject: [PATCH 004/347] * Add sql for sprint zentaopms_295. --- db/zentao.sql | 35 +++++++++++++++++++++++++++++++++++ db/zentaopms295.sql | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 db/zentaopms295.sql diff --git a/db/zentao.sql b/db/zentao.sql index 047ef4fa39..2aee311b34 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -813,6 +813,41 @@ CREATE TABLE IF NOT EXISTS `zt_grouppriv` ( `method` char(30) NOT NULL default '', UNIQUE KEY `group` (`group`,`module`,`method`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- DROP TABLE IF EXISTS `zt_priv`; +CREATE TABLE IF NOT EXISTS `zt_priv` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `moduleName` varchar(30) NOT NULL, + `methodName` varchar(30) NOT NULL, + `module` varchar(30) NOT NULL, + `package` mediumint(8) unsigned NOT NULL, + `order` tinyint(3) unsigned NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `priv` (`moduleName`,`methodName`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- DROP TABLE IF EXISTS `zt_privlang`; +CREATE TABLE IF NOT EXISTS `zt_privlang` ( + `priv` mediumint(8) unsigned NOT NULL, + `lang` varchar(30) NOT NULL, + `name` varchar(255) NOT NULL, + `desc` text NOT NULL, + UNIQUE KEY `privlang` (`priv`,`lang`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- DROP TABLE IF EXISTS `zt_privpackage`; +CREATE TABLE IF NOT EXISTS `zt_privpackage` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `module` varchar(30) NOT NULL, + `name` varchar(255) NOT NULL, + `desc` text NOT NULL, + `order` tinyint(3) unsigned NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- DROP TABLE IF EXISTS `zt_privrelation`; +CREATE TABLE IF NOT EXISTS `zt_privrelation` ( + `priv` mediumint(8) unsigned NOT NULL, + `type` varchar(30) NOT NULL, + `relationPriv` mediumint(8) unsigned NOT NULL, + UNIQUE KEY `privrelation`(`priv`, `type`, `relationPriv`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_holiday`; CREATE TABLE IF NOT EXISTS `zt_holiday` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, diff --git a/db/zentaopms295.sql b/db/zentaopms295.sql new file mode 100644 index 0000000000..b7615514ed --- /dev/null +++ b/db/zentaopms295.sql @@ -0,0 +1,35 @@ +-- DROP TABLE IF EXISTS `zt_priv`; +CREATE TABLE IF NOT EXISTS `zt_priv` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `moduleName` varchar(30) NOT NULL, + `methodName` varchar(30) NOT NULL, + `module` varchar(30) NOT NULL, + `package` mediumint(8) unsigned NOT NULL, + `order` tinyint(3) unsigned NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `priv` (`moduleName`,`methodName`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- DROP TABLE IF EXISTS `zt_privlang`; +CREATE TABLE IF NOT EXISTS `zt_privlang` ( + `priv` mediumint(8) unsigned NOT NULL, + `lang` varchar(30) NOT NULL, + `name` varchar(255) NOT NULL, + `desc` text NOT NULL, + UNIQUE KEY `privlang` (`priv`,`lang`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- DROP TABLE IF EXISTS `zt_privpackage`; +CREATE TABLE IF NOT EXISTS `zt_privpackage` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `module` varchar(30) NOT NULL, + `name` varchar(255) NOT NULL, + `desc` text NOT NULL, + `order` tinyint(3) unsigned NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- DROP TABLE IF EXISTS `zt_privrelation`; +CREATE TABLE IF NOT EXISTS `zt_privrelation` ( + `priv` mediumint(8) unsigned NOT NULL, + `type` varchar(30) NOT NULL, + `relationPriv` mediumint(8) unsigned NOT NULL, + UNIQUE KEY `privrelation`(`priv`, `type`, `relationPriv`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; From 86a9cb6055026ef505bfb1634d13baa5dd4ca036 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 7 Mar 2023 01:23:45 +0000 Subject: [PATCH 005/347] * Add zentaopms295 table config. --- config/zentaopms.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/zentaopms.php b/config/zentaopms.php index 836c84acfe..653b891433 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -356,6 +356,11 @@ define('TABLE_DATASET', '`' . $config->db->prefix . 'dataset`'); define('TABLE_DATAVIEW', '`' . $config->db->prefix . 'dataview`'); define('TABLE_DIMENSION', '`' . $config->db->prefix . 'dimension`'); +define('TABLE_PRIV', '`' . $config->db->prefix . 'priv`'); +define('TABLE_PRIVLANG', '`' . $config->db->prefix . 'privlang`'); +define('TABLE_PRIVPACKAGE', '`' . $config->db->prefix . 'privpackage`'); +define('TABLE_PRIVRELATION', '`' . $config->db->prefix . 'privrelation`'); + $config->objectTables['product'] = TABLE_PRODUCT; $config->objectTables['productplan'] = TABLE_PRODUCTPLAN; $config->objectTables['story'] = TABLE_STORY; @@ -409,6 +414,10 @@ $config->objectTables['zahost'] = TABLE_ZAHOST; $config->objectTables['zanode'] = TABLE_ZAHOST; $config->objectTables['automation'] = TABLE_AUTOMATION; $config->objectTables['stepResult'] = TABLE_TESTRUN; +$config->objectTables['priv'] = TABLE_PRIV; +$config->objectTables['privlang'] = TABLE_PRIVLANG; +$config->objectTables['privpackage'] = TABLE_PRIVPACKAGE; +$config->objectTables['privrelation'] = TABLE_PRIVRELATION; $config->newFeatures = array('introduction', 'tutorial', 'youngBlueTheme', 'visions'); $config->disabledFeatures = ''; From fb8a7f81026df0380f6e3a7091da6165f313fe83 Mon Sep 17 00:00:00 2001 From: guofeilong Date: Tue, 7 Mar 2023 09:59:40 +0800 Subject: [PATCH 006/347] * Adjust code for task #86260. --- module/group/css/permissionedit.css | 1 + module/group/lang/de.php | 3 +++ module/group/lang/en.php | 4 ++++ module/group/lang/fr.php | 3 +++ module/group/lang/vi.php | 3 +++ module/group/lang/zh-cn.php | 3 +++ module/group/view/permissionedit.html.php | 17 ++++++++++++++--- 7 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 module/group/css/permissionedit.css diff --git a/module/group/css/permissionedit.css b/module/group/css/permissionedit.css new file mode 100644 index 0000000000..95e2b09812 --- /dev/null +++ b/module/group/css/permissionedit.css @@ -0,0 +1 @@ +.flex-space-center {display: flex; justify-content: space-between; align-items: center;} diff --git a/module/group/lang/de.php b/module/group/lang/de.php index da4a125cfc..b89a5e0a3f 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -49,6 +49,9 @@ $lang->group->allCheck = 'All'; $lang->group->noGroup = 'No group'; $lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; $lang->group->noneProject = 'No Project'; +$lang->group->addPriv = 'Add Priv'; +$lang->group->servicePrivPackage = 'Service Priv Package'; +$lang->group->batchSetDependency = 'Batch Set Dependency'; $lang->group->id = 'ID'; $lang->group->name = 'Name'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 0528884d38..5b19993c41 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -49,6 +49,10 @@ $lang->group->allCheck = 'All'; $lang->group->noGroup = 'No group'; $lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; $lang->group->noneProject = 'No Project'; +$lang->group->addPriv = 'Add Priv'; +$lang->group->servicePrivPackage = 'Service Priv Package'; +$lang->group->batchSetDependency = 'Batch Set Dependency'; + $lang->group->id = 'ID'; $lang->group->name = 'Group'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 9c56cc8cb7..99099dbbf0 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -49,6 +49,9 @@ $lang->group->allCheck = 'All'; $lang->group->noGroup = 'Aucun groupe'; $lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; $lang->group->noneProject = 'No Project'; +$lang->group->addPriv = 'Add Priv'; +$lang->group->servicePrivPackage = 'Service Priv Package'; +$lang->group->batchSetDependency = 'Batch Set Dependency'; $lang->group->id = 'ID'; $lang->group->name = 'Groupe'; diff --git a/module/group/lang/vi.php b/module/group/lang/vi.php index ed5239639e..ffcc1dbcab 100644 --- a/module/group/lang/vi.php +++ b/module/group/lang/vi.php @@ -36,6 +36,9 @@ $lang->group->noticeVisit = 'Blank means no access limit.'; $lang->group->noneProgram = "No Program"; $lang->group->noneProduct = "Không có {$lang->productCommon}"; $lang->group->noneProject = "No Project"; +$lang->group->addPriv = 'Add Priv'; +$lang->group->servicePrivPackage = 'Service Priv Package'; +$lang->group->batchSetDependency = 'Batch Set Dependency'; $lang->group->id = 'ID'; $lang->group->name = 'Nhóm'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index de9aafaa8d..bcd3e9f7b6 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -49,6 +49,9 @@ $lang->group->allCheck = '全部'; $lang->group->noGroup = '暂时没有分组。'; $lang->group->repeat = "『%s』已经有『%s』这条记录了,请调整后再试。"; $lang->group->noneProject = '暂时没有项目'; +$lang->group->addPriv = '新增权限'; +$lang->group->servicePrivPackage = '维护权限包'; +$lang->group->batchSetDependency = '批量设置依赖'; $lang->group->id = '编号'; $lang->group->name = '分组名称'; diff --git a/module/group/view/permissionedit.html.php b/module/group/view/permissionedit.html.php index 766267d28f..88cfa4bcdd 100644 --- a/module/group/view/permissionedit.html.php +++ b/module/group/view/permissionedit.html.php @@ -11,9 +11,20 @@ */ ?> -
- logout, '', 'btn-primary');?> -
+
From 661446dd7e084b7612fcaa3b1d1a20e78d056c7e Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 7 Mar 2023 02:46:13 +0000 Subject: [PATCH 007/347] * Finish task #86261. --- module/group/control.php | 24 ++++++++++++++++ module/group/lang/de.php | 3 +- module/group/lang/en.php | 4 +-- module/group/lang/fr.php | 3 +- module/group/lang/zh-cn.php | 3 +- module/group/view/manageprivpackage.html.php | 29 ++++++++++++++++++++ module/group/view/permissionedit.html.php | 2 +- 7 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 module/group/view/manageprivpackage.html.php diff --git a/module/group/control.php b/module/group/control.php index 5d8d6a4e9a..7d5ccdea52 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -392,4 +392,28 @@ class group extends control $this->view->title = $this->lang->group->permissionedit; $this->display(); } + + /** + * Manage privilege packages. + * + * @access public + * @return void + */ + public function managePrivPackage() + { + $this->view->title = $this->lang->group->managePrivPackage; + $this->display(); + } + + /** + * Create a privilege package. + * + * @access public + * @return void + */ + public function createPrivPackage() + { + $this->view->title = $this->lang->group->createPrivPackage; + $this->display(); + } } diff --git a/module/group/lang/de.php b/module/group/lang/de.php index b89a5e0a3f..26595ee057 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -50,8 +50,9 @@ $lang->group->noGroup = 'No group'; $lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; $lang->group->noneProject = 'No Project'; $lang->group->addPriv = 'Add Priv'; -$lang->group->servicePrivPackage = 'Service Priv Package'; +$lang->group->managePrivPackage = 'Manage Priv Package'; $lang->group->batchSetDependency = 'Batch Set Dependency'; +$lang->group->createPrivPackage = 'Create Priv Package'; $lang->group->id = 'ID'; $lang->group->name = 'Name'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 5b19993c41..07966839d2 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -50,9 +50,9 @@ $lang->group->noGroup = 'No group'; $lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; $lang->group->noneProject = 'No Project'; $lang->group->addPriv = 'Add Priv'; -$lang->group->servicePrivPackage = 'Service Priv Package'; +$lang->group->managePrivPackage = 'Manage Priv Package'; $lang->group->batchSetDependency = 'Batch Set Dependency'; - +$lang->group->createPrivPackage = 'Create Priv Package'; $lang->group->id = 'ID'; $lang->group->name = 'Group'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 99099dbbf0..89941b7071 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -50,8 +50,9 @@ $lang->group->noGroup = 'Aucun groupe'; $lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; $lang->group->noneProject = 'No Project'; $lang->group->addPriv = 'Add Priv'; -$lang->group->servicePrivPackage = 'Service Priv Package'; +$lang->group->managePrivPackage = 'Manage Priv Package'; $lang->group->batchSetDependency = 'Batch Set Dependency'; +$lang->group->createPrivPackage = 'Create Priv Package'; $lang->group->id = 'ID'; $lang->group->name = 'Groupe'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index bcd3e9f7b6..18c16e9013 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -50,8 +50,9 @@ $lang->group->noGroup = '暂时没有分组。'; $lang->group->repeat = "『%s』已经有『%s』这条记录了,请调整后再试。"; $lang->group->noneProject = '暂时没有项目'; $lang->group->addPriv = '新增权限'; -$lang->group->servicePrivPackage = '维护权限包'; +$lang->group->managePrivPackage = '维护权限包'; $lang->group->batchSetDependency = '批量设置依赖'; +$lang->group->createPrivPackage = '新增权限包'; $lang->group->id = '编号'; $lang->group->name = '分组名称'; diff --git a/module/group/view/manageprivpackage.html.php b/module/group/view/manageprivpackage.html.php new file mode 100644 index 0000000000..92ee5d17a9 --- /dev/null +++ b/module/group/view/manageprivpackage.html.php @@ -0,0 +1,29 @@ + + * @package group + * @version $Id: manageprivpackage.html.php 4769 2023-03-07 10:09:21Z liumengyi $ + * @link https://www.zentao.net + */ +?> + + +
+
+ + diff --git a/module/group/view/permissionedit.html.php b/module/group/view/permissionedit.html.php index 88cfa4bcdd..3bf2e6de62 100644 --- a/module/group/view/permissionedit.html.php +++ b/module/group/view/permissionedit.html.php @@ -22,7 +22,7 @@ createLink('', '', '', '', false), '', '', 'class="btn"');?>
group->addPriv?> - group->servicePrivPackage?> + createLink('group', 'managePrivPackage', ''), $lang->group->managePrivPackage, '', 'class="btn btn-primary"');?> group->batchSetDependency?> From df822fb318f6c1482f83d356a61cfa7d83fa364e Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 7 Mar 2023 05:07:09 +0000 Subject: [PATCH 008/347] * Finish task #86263. --- module/group/config.php | 6 +++ module/group/control.php | 10 ++++- module/group/css/createprivpackage.en.css | 1 + module/group/lang/de.php | 6 +++ module/group/lang/en.php | 6 +++ module/group/lang/fr.php | 6 +++ module/group/lang/zh-cn.php | 6 +++ module/group/model.php | 13 +++++++ module/group/view/createprivpackage.html.php | 41 ++++++++++++++++++++ module/group/view/manageprivpackage.html.php | 2 +- 10 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 module/group/css/createprivpackage.en.css create mode 100644 module/group/view/createprivpackage.html.php diff --git a/module/group/config.php b/module/group/config.php index 27f5d795f7..9531273972 100644 --- a/module/group/config.php +++ b/module/group/config.php @@ -11,3 +11,9 @@ $config->group->acl->objectTypes['programs'] = 'program'; $config->group->acl->objectTypes['projects'] = 'project'; $config->group->acl->objectTypes['products'] = 'product'; $config->group->acl->objectTypes['sprints'] = 'sprint'; + +$config->privPackage = new stdclass(); +$config->privPackage->create = new stdclass(); +$config->privPackage->edit = new stdclass(); +$config->privPackage->create->requiredFields = 'name,module'; +$config->privPackage->edit->requiredFields = 'name,module'; diff --git a/module/group/control.php b/module/group/control.php index 7d5ccdea52..487f6a998c 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -413,7 +413,15 @@ class group extends control */ public function createPrivPackage() { - $this->view->title = $this->lang->group->createPrivPackage; + if(!empty($_POST)) + { + $packageID = $this->group->createPrivPackage(); + if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); + } + + $this->view->title = $this->lang->group->createPrivPackage; + $this->view->modules = array(); $this->display(); } } diff --git a/module/group/css/createprivpackage.en.css b/module/group/css/createprivpackage.en.css new file mode 100644 index 0000000000..c4eadadd59 --- /dev/null +++ b/module/group/css/createprivpackage.en.css @@ -0,0 +1 @@ +#createPrivPackage .c-name {width: 135px;} diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 26595ee057..7b13c67042 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -71,6 +71,12 @@ $lang->group->other = 'Andere'; $lang->group->all = 'Alle'; $lang->group->config = 'Config'; +if(!isset($lang->privPackage)) $lang->privPackage = new stdclass(); +$lang->privPackage->id = 'ID'; +$lang->privPackage->name = 'Priv Package Name'; +$lang->privPackage->module = 'Module'; +$lang->privPackage->desc = 'Priv Package Desc'; + $lang->group->copyOptions['copyPriv'] = 'Rechte kopieren'; $lang->group->copyOptions['copyUser'] = 'Benutzer kopieren'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 07966839d2..6a8530e145 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -71,6 +71,12 @@ $lang->group->other = 'Others'; $lang->group->all = 'All Privileges'; $lang->group->config = 'Config'; +if(!isset($lang->privPackage)) $lang->privPackage = new stdclass(); +$lang->privPackage->id = 'ID'; +$lang->privPackage->name = 'Priv Package Name'; +$lang->privPackage->module = 'Module'; +$lang->privPackage->desc = 'Priv Package Desc'; + $lang->group->copyOptions['copyPriv'] = 'Copy Privileges'; $lang->group->copyOptions['copyUser'] = 'Copy Users'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 89941b7071..b09f56a893 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -71,6 +71,12 @@ $lang->group->other = 'Autres'; $lang->group->all = 'Tous les Privilèges'; $lang->group->config = 'Config'; +if(!isset($lang->privPackage)) $lang->privPackage = new stdclass(); +$lang->privPackage->id = 'ID'; +$lang->privPackage->name = 'Priv Package Name'; +$lang->privPackage->module = 'Module'; +$lang->privPackage->desc = 'Priv Package Desc'; + $lang->group->copyOptions['copyPriv'] = 'Copier Privilèges'; $lang->group->copyOptions['copyUser'] = 'Copier Utilisateurs'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 18c16e9013..ed5d63fc63 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -71,6 +71,12 @@ $lang->group->other = '其他模块'; $lang->group->all = '所有权限'; $lang->group->config = '配置'; +if(!isset($lang->privpackage)) $lang->privpackage = new stdclass(); +$lang->privpackage->id = '编号'; +$lang->privpackage->name = '权限包名称'; +$lang->privpackage->module = '所属模块'; +$lang->privpackage->desc = '权限包说明'; + $lang->group->copyOptions['copyPriv'] = '复制权限'; $lang->group->copyOptions['copyUser'] = '复制用户'; diff --git a/module/group/model.php b/module/group/model.php index 3ab0e853df..fdcdc10a15 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -755,4 +755,17 @@ class groupModel extends model return true; } + + /** + * Create a privilege package. + * + * @access public + * @return bool + */ + public function createPrivPackage() + { + $package = fixer::input('post')->get(); + $this->dao->insert(TABLE_PRIVPACKAGE)->data($package)->batchCheck($this->config->privPackage->create->requiredFields, 'notempty')->exec(); + return $this->dao->lastInsertId(); + } } diff --git a/module/group/view/createprivpackage.html.php b/module/group/view/createprivpackage.html.php new file mode 100644 index 0000000000..50b9b86b27 --- /dev/null +++ b/module/group/view/createprivpackage.html.php @@ -0,0 +1,41 @@ + + * @package group + * @version $Id: createprivpackage.html.php 4769 2023-03-07 10:09:21Z liumengyi $ + * @link https://www.zentao.net + */ +?> + +
+
+

group->createPrivPackage;?>

+
+
+ + + + + + + + + + + + + + + + + + +
privpackage->name;?>
privpackage->module;?>
privpackage->desc;?>
+
+
+ + diff --git a/module/group/view/manageprivpackage.html.php b/module/group/view/manageprivpackage.html.php index 92ee5d17a9..e96edd4733 100644 --- a/module/group/view/manageprivpackage.html.php +++ b/module/group/view/manageprivpackage.html.php @@ -20,7 +20,7 @@
- createLink('group', 'createPrivPackage', '', '', true), $lang->group->createPrivPackage, '', 'class="btn btn-primary iframe"');?> + createLink('group', 'createPrivPackage', '', '', true), $lang->group->createPrivPackage, '', 'class="btn btn-primary iframe" data-width="500"');?>
From d1015fd40db87c2cbc4980a98c7e06e023b0b51b Mon Sep 17 00:00:00 2001 From: guofeilong Date: Tue, 7 Mar 2023 13:39:54 +0800 Subject: [PATCH 009/347] * Adjust code for task #86260 --- module/group/css/permissionedit.css | 11 +++++ module/group/js/permissionedit.js | 12 +++++ module/group/lang/de.php | 1 + module/group/lang/en.php | 1 + module/group/lang/fr.php | 1 + module/group/lang/vi.php | 1 + module/group/lang/zh-cn.php | 1 + module/group/view/permissionedit.html.php | 55 ++++++++++++++++++++--- 8 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 module/group/js/permissionedit.js diff --git a/module/group/css/permissionedit.css b/module/group/css/permissionedit.css index 95e2b09812..86e5e07e24 100644 --- a/module/group/css/permissionedit.css +++ b/module/group/css/permissionedit.css @@ -1 +1,12 @@ +.mt-m {margin-top: 16px;} + .flex-space-center {display: flex; justify-content: space-between; align-items: center;} +#mainContent {display: flex; gap: 16px;} +#mainContent > .main {flex: 1 1 75%;} +#mainContent > .side {flex: 1 1 25%;} + +.priv-panel {background: #fff; padding: 10px; box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 5%);} +.priv-panel > .panel-content > .panel-list {display: flex; flex-wrap: wrap; padding-left: 16px;} +.priv-panel > .panel-content > button {margin-top: 20px;} +.panel-list > .priv-item {flex: 1 1 50%;} + diff --git a/module/group/js/permissionedit.js b/module/group/js/permissionedit.js new file mode 100644 index 0000000000..b42fdad232 --- /dev/null +++ b/module/group/js/permissionedit.js @@ -0,0 +1,12 @@ +$(function() +{ + $(".panel-list").on('mouseover', ".priv-item", function() + { + $(this).addClass('text-primary'); + $(this).find('.icon').removeClass('hidden'); + }).on('mouseout', '.priv-item', function() + { + $(this).removeClass('text-primary'); + $(this).find('.icon').addClass('hidden'); + }) +}); diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 7b13c67042..794c186301 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -53,6 +53,7 @@ $lang->group->addPriv = 'Add Priv'; $lang->group->managePrivPackage = 'Manage Priv Package'; $lang->group->batchSetDependency = 'Batch Set Dependency'; $lang->group->createPrivPackage = 'Create Priv Package'; +$lang->group->add = 'Add'; $lang->group->id = 'ID'; $lang->group->name = 'Name'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 6a8530e145..d83a94a630 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -53,6 +53,7 @@ $lang->group->addPriv = 'Add Priv'; $lang->group->managePrivPackage = 'Manage Priv Package'; $lang->group->batchSetDependency = 'Batch Set Dependency'; $lang->group->createPrivPackage = 'Create Priv Package'; +$lang->group->add = 'Add'; $lang->group->id = 'ID'; $lang->group->name = 'Group'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index b09f56a893..aa8111688a 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -53,6 +53,7 @@ $lang->group->addPriv = 'Add Priv'; $lang->group->managePrivPackage = 'Manage Priv Package'; $lang->group->batchSetDependency = 'Batch Set Dependency'; $lang->group->createPrivPackage = 'Create Priv Package'; +$lang->group->add = 'Add'; $lang->group->id = 'ID'; $lang->group->name = 'Groupe'; diff --git a/module/group/lang/vi.php b/module/group/lang/vi.php index ffcc1dbcab..580ad11012 100644 --- a/module/group/lang/vi.php +++ b/module/group/lang/vi.php @@ -39,6 +39,7 @@ $lang->group->noneProject = "No Project"; $lang->group->addPriv = 'Add Priv'; $lang->group->servicePrivPackage = 'Service Priv Package'; $lang->group->batchSetDependency = 'Batch Set Dependency'; +$lang->group->add = 'Add'; $lang->group->id = 'ID'; $lang->group->name = 'Nhóm'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index ed5d63fc63..4c8c9de126 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -53,6 +53,7 @@ $lang->group->addPriv = '新增权限'; $lang->group->managePrivPackage = '维护权限包'; $lang->group->batchSetDependency = '批量设置依赖'; $lang->group->createPrivPackage = '新增权限包'; +$lang->group->add = '添加'; $lang->group->id = '编号'; $lang->group->name = '分组名称'; diff --git a/module/group/view/permissionedit.html.php b/module/group/view/permissionedit.html.php index 3bf2e6de62..bde38599db 100644 --- a/module/group/view/permissionedit.html.php +++ b/module/group/view/permissionedit.html.php @@ -1,20 +1,20 @@ + * @author Feilong Guo * @package group - * @version $Id: browse.html.php 4769 2013-05-05 07:24:21Z wwccss $ + * @version permissionedit.html.php 4769 2023-03-07 07:24:21Z guofeilong $ * @link http://www.zentao.net */ ?>
+
+ + + + + + + + + + + + > + + + + + + + +
+ privpackage->common;?> + + privpackage->desc;?>sort;?>actions;?>
name?>desc?> +
+
From 1e61213ce297c42175b8244ba1271b6248784325 Mon Sep 17 00:00:00 2001 From: guofeilong Date: Wed, 8 Mar 2023 13:08:58 +0800 Subject: [PATCH 024/347] * Adjust code for view in permissionedit . --- module/group/css/permissionedit.css | 14 ++- module/group/view/permissionedit.html.php | 142 +++++++++++++++++++++- 2 files changed, 149 insertions(+), 7 deletions(-) diff --git a/module/group/css/permissionedit.css b/module/group/css/permissionedit.css index 12c2aef1d0..ec1bf8c805 100644 --- a/module/group/css/permissionedit.css +++ b/module/group/css/permissionedit.css @@ -1,18 +1,22 @@ .mt-m {margin-top: 16px;} .flex-space-center {display: flex; justify-content: space-between; align-items: center;} -#mainContent {display: flex; gap: 16px;} +#mainContent {display: flex; gap: 16px; height: calc(100vh - 120px)} #mainContent > .main {flex: 1 1 75%;} #mainContent > .side {flex: 1 1 25%;} .priv-panel {background: #fff; padding: 10px; box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 5%);} -.priv-panel > .panel-content {height: calc(50vh - 165px); overflow-y: auto; min-height: 140px;} +.priv-panel > .panel-content {height: calc(50vh - 160px); overflow-y: auto; min-height: 140px;} .priv-panel > .panel-bottom {padding-top: 20px;} /* permission-table */ -.permission-head {padding-right: 20px; display: flex;} -.permission-head > .flex-title {flex: 1 1 15%;} -.permission-head > .flex-content {flex: 1 1 70%;} +/* .permission-head {padding-right: 20px;}*/ +#permissionEditForm tr {display: flex;} +#permissionEditForm {overflow-y: auto; height: calc(100vh - 180px)} +.flex-sm {flex: 1 1 15%;} +.flex-content {flex: 1 1 70%;} +.sorter-group {display: flex; flex-wrap: wrap;} +.sorter-group > .group-item {flex: 1 1 25%;} /* tree */ .tree ul > li {display: inline-block; width: 50%;} diff --git a/module/group/view/permissionedit.html.php b/module/group/view/permissionedit.html.php index 4a1caf5e4e..43b5faa38f 100644 --- a/module/group/view/permissionedit.html.php +++ b/module/group/view/permissionedit.html.php @@ -32,12 +32,150 @@ - - + + + + + + + + + + + +
模块权限包模块权限包 权限
首页 首页 +
+
+ + +
+
+
地盘 地盘 +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
From 9cf6f42f2051e69a9f2db16076f1686e70383159 Mon Sep 17 00:00:00 2001 From: guofeilong Date: Wed, 8 Mar 2023 13:11:28 +0800 Subject: [PATCH 025/347] * Adjust code for sortable in permissionedit . --- module/group/js/permissionedit.js | 1 + 1 file changed, 1 insertion(+) diff --git a/module/group/js/permissionedit.js b/module/group/js/permissionedit.js index c5700c634f..86074f66e0 100644 --- a/module/group/js/permissionedit.js +++ b/module/group/js/permissionedit.js @@ -63,4 +63,5 @@ $(function() initRecomendTree(data); initDependTree(data); $('li.has-list > ul').addClass("menu-active-primary menu-hover-primary"); + $('.sorter-group').sortable(); }); From 746748e080cab51b21c16cb4335f1008d3b23636 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 8 Mar 2023 06:04:44 +0000 Subject: [PATCH 026/347] * Finish task #86267. --- module/group/control.php | 23 ++++++++++++++++++++ module/group/lang/de.php | 1 + module/group/lang/en.php | 1 + module/group/lang/fr.php | 1 + module/group/lang/zh-cn.php | 1 + module/group/model.php | 7 ++++++ module/group/view/manageprivpackage.html.php | 6 ++++- 7 files changed, 39 insertions(+), 1 deletion(-) diff --git a/module/group/control.php b/module/group/control.php index ba79ae8d38..5abb6d5ed8 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -453,4 +453,27 @@ class group extends control $this->view->users = $this->loadModel('user')->getPairs(); $this->display(); } + + /** + * Delete a priv package. + * + * @param int $privPackageID + * @access public + * @return void + */ + public function deletePrivPackage($privPackageID, $confirm = 'no') + { + if($confirm == 'no') + { + return print(js::confirm($this->lang->group->confirmDeleteAB, $this->createLink('group', 'deletePrivPackage', "privPackageID=$privPackageID&confirm=yes"))); + } + else + { + $this->group->deletePrivPackage($privPackageID); + if(!dao::isError()) $this->loadModel('action')->create('privpackage', $privPackageID, 'deleted'); + + return print(js::reload('parent')); + } + + } } diff --git a/module/group/lang/de.php b/module/group/lang/de.php index bfbcc725f1..10f99b0d76 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -25,6 +25,7 @@ $lang->group->manageMember = 'Mitglieder'; $lang->group->manageProjectAdmin = 'Manage Program Admins'; $lang->group->permissionedit = 'Permission Edit'; $lang->group->confirmDelete = "Do you want to delete '%s'?"; +$lang->group->confirmDeleteAB = 'Do you want to delete this?'; $lang->group->successSaved = 'Gespeichert!'; $lang->group->errorNotSaved = 'Fehlgeschlagen. Bitte aktion und Gruppe wählen.'; $lang->group->viewList = 'Anzeige ist zulässig.'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index be7b8210af..b400789c6a 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -25,6 +25,7 @@ $lang->group->manageMember = 'Manage Members'; $lang->group->manageProjectAdmin = 'Manage Program Admins'; $lang->group->permissionedit = 'Permission Edit'; $lang->group->confirmDelete = "Do you want to delete '%s'?"; +$lang->group->confirmDeleteAB = 'Do you want to delete this?'; $lang->group->successSaved = 'Saved.'; $lang->group->errorNotSaved = 'Failed. Please select actions and groups.'; $lang->group->viewList = 'Access Sight'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 0b9dfff119..e173b8afd2 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -25,6 +25,7 @@ $lang->group->manageMember = 'Gérer Membres'; $lang->group->manageProjectAdmin = 'Manage Program Admins'; $lang->group->permissionedit = 'Permission Edit'; $lang->group->confirmDelete = "Voulez - vous supprimer '%s'?"; +$lang->group->confirmDeleteAB = 'Do you want to delete this?'; $lang->group->successSaved = 'Sauvé.'; $lang->group->errorNotSaved = 'Echec. Veuillez sélectionner actions et groupes.'; $lang->group->viewList = 'Accès Consultation'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 7fde55210b..06ff549f3c 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -25,6 +25,7 @@ $lang->group->manageMember = '成员维护'; $lang->group->manageProjectAdmin = '维护项目管理员'; $lang->group->permissionedit = '维护权限'; $lang->group->confirmDelete = '您确定删除“%s”用户分组吗?'; +$lang->group->confirmDeleteAB = '您确定删除吗?'; $lang->group->successSaved = '成功保存'; $lang->group->errorNotSaved = '没有保存,请确认选择了权限数据。'; $lang->group->viewList = '可访问视图'; diff --git a/module/group/model.php b/module/group/model.php index a1a75bd73c..c9039c73bf 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -802,6 +802,13 @@ class groupModel extends model return $changes; } + public function deletePrivPackage($packageID) + { + $this->dao->delete()->from(TABLE_PRIVPACKAGE)->where('id')->eq($packageID)->exec(); + if(dao::isError()) return false; + $this->dao->update(TABLE_PRIV)->set('package')->eq(0)->where('package')->eq($packageID)->exec(); + } + /** * Get priv package by ID. * diff --git a/module/group/view/manageprivpackage.html.php b/module/group/view/manageprivpackage.html.php index b479ba3f3c..60dffdb261 100644 --- a/module/group/view/manageprivpackage.html.php +++ b/module/group/view/manageprivpackage.html.php @@ -42,8 +42,12 @@ > name?> desc?> - + ';?> + grade == 3) common::printIcon('group', 'editPrivPackage', "packageID=$package->id", '', 'list', 'edit', '', 'iframe', true); + if(common::hasPriv('group', 'deletePrivPackage') and $package->grade == 3) common::printIcon('group', 'deletePrivPackage', "packageID=$package->id", '', 'list', 'trash', 'hiddenwin'); + ?> From c11e796b4717d464c1f724417e722b65c4306c93 Mon Sep 17 00:00:00 2001 From: guofeilong Date: Wed, 8 Mar 2023 14:11:49 +0800 Subject: [PATCH 027/347] * Adjust code for view editmanagepriv . --- module/group/control.php | 7 +- ...{permissionedit.css => editmanagepriv.css} | 0 .../{permissionedit.js => editmanagepriv.js} | 0 module/group/view/browse.html.php | 2 +- module/group/view/editmanagepriv.html.php | 64 ++++++ .../group/view/editmanageprivbycard.html.php | 0 .../group/view/editmanageprivbylist.html.php | 69 ++++++ module/group/view/permissionedit.html.php | 205 ------------------ 8 files changed, 138 insertions(+), 209 deletions(-) rename module/group/css/{permissionedit.css => editmanagepriv.css} (100%) rename module/group/js/{permissionedit.js => editmanagepriv.js} (100%) create mode 100644 module/group/view/editmanagepriv.html.php create mode 100644 module/group/view/editmanageprivbycard.html.php create mode 100644 module/group/view/editmanageprivbylist.html.php delete mode 100644 module/group/view/permissionedit.html.php diff --git a/module/group/control.php b/module/group/control.php index 5abb6d5ed8..849fa0111c 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -382,14 +382,15 @@ class group extends control } /** - * edit permission. + * edit manage priv. * * @access public * @return void */ - public function permissionedit() + public function editManagePriv() { - $this->view->title = $this->lang->group->permissionedit; + $this->view->title = $this->lang->group->permissionedit; + $this->view->projectType = 'bylist'; $this->display(); } diff --git a/module/group/css/permissionedit.css b/module/group/css/editmanagepriv.css similarity index 100% rename from module/group/css/permissionedit.css rename to module/group/css/editmanagepriv.css diff --git a/module/group/js/permissionedit.js b/module/group/js/editmanagepriv.js similarity index 100% rename from module/group/js/permissionedit.js rename to module/group/js/editmanagepriv.js diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index 0b8aceb0c9..a3383fc478 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -18,7 +18,7 @@ group->browse;?>
- createLink('group', 'permissionedit', '', '', false), '' . $lang->group->permissionedit, '', 'class="btn btn-link"');?> + createLink('group', 'editManagePriv', '', '', false), '' . $lang->group->permissionedit, '', 'class="btn btn-link"');?> createLink('group', 'managePriv', 'type=byModule', '', true), $lang->group->managePrivByModule, '', 'class="btn btn-link iframe"');?> createLink('group', 'create', '', '', true), ' ' . $lang->group->create, '', 'class="btn btn-primary iframe" data-width="550"');?>
diff --git a/module/group/view/editmanagepriv.html.php b/module/group/view/editmanagepriv.html.php new file mode 100644 index 0000000000..0742ebd4b3 --- /dev/null +++ b/module/group/view/editmanagepriv.html.php @@ -0,0 +1,64 @@ + + * @package group + * @version $id editManagePriv.html.php 4769 2023-03-07 07:24:21Z guofeilong $ + * @link http://www.zentao.net + */ +?> + + +
+
+ + +
+
+
+
依赖的权限
+
+ +
+
+ ' . $lang->group->add, '', 'btn btn-primary');?> +
+
+
+
推荐的权限
+
+ +
+
+ ' . $lang->group->add, '', 'btn btn-primary');?> +
+
+
+
+ + diff --git a/module/group/view/editmanageprivbycard.html.php b/module/group/view/editmanageprivbycard.html.php new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/group/view/editmanageprivbylist.html.php b/module/group/view/editmanageprivbylist.html.php new file mode 100644 index 0000000000..9b8137f209 --- /dev/null +++ b/module/group/view/editmanageprivbylist.html.php @@ -0,0 +1,69 @@ + +* @package group +* @version $Id: editmanageprivbylist.html.php 4769 2021-07-23 11:16:21Z $ +* @link https://www.zentao.net +*/ +?> + +
+ + + + + + + + + + + + + + + + + + + + +
模块权限包权限
首页 首页 +
+
+ + +
+
+
地盘 地盘 +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ diff --git a/module/group/view/permissionedit.html.php b/module/group/view/permissionedit.html.php deleted file mode 100644 index 43b5faa38f..0000000000 --- a/module/group/view/permissionedit.html.php +++ /dev/null @@ -1,205 +0,0 @@ - - * @package group - * @version permissionedit.html.php 4769 2023-03-07 07:24:21Z guofeilong $ - * @link http://www.zentao.net - */ -?> - - -
-
-
- - - - - - - - - - - - - - - - - - - - -
模块权限包权限
首页 首页 -
-
- - -
-
-
地盘 地盘 -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
-
-
依赖的权限
-
- -
-
- ' . $lang->group->add, '', 'btn btn-primary');?> -
-
-
-
推荐的权限
-
- -
-
- ' . $lang->group->add, '', 'btn btn-primary');?> -
-
-
-
- - From 911099de2591a00f9f430c7ff4ed8ecc791e08c5 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 8 Mar 2023 06:18:11 +0000 Subject: [PATCH 028/347] * Fix bug. --- module/group/view/manageprivpackage.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/view/manageprivpackage.html.php b/module/group/view/manageprivpackage.html.php index 60dffdb261..b79bae800e 100644 --- a/module/group/view/manageprivpackage.html.php +++ b/module/group/view/manageprivpackage.html.php @@ -13,7 +13,7 @@ -
+
@@ -113,8 +113,8 @@ $i = 1; - $modulePrivs = count($privList[$moduleName], 1) - count($selectPrivs[$moduleName], 1); - $moduleSelect = array_sum($selectPrivs[$moduleName]); + $modulePrivs = count($privList[$moduleName], 1) - count($selectPrivs[$moduleName], 1); + $moduleSelect = array_sum($selectPrivs[$moduleName]); ?> $privs):?> '> @@ -163,7 +163,8 @@
- group->dependentPrivs?> + group->dependentPrivs;?> +
@@ -174,7 +175,8 @@
- group->recommendPrivs?> + group->recommendPrivs;?> +
@@ -198,9 +200,12 @@ + From 3d94f2439a30586c8380689f708f8283fc3f7f02 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 12 Apr 2023 16:13:39 +0800 Subject: [PATCH 194/347] * Finish task #91012. --- module/group/css/managepriv.css | 2 +- module/group/js/managepriv.js | 3 +++ module/group/view/privbygroup.html.php | 4 ++++ module/group/view/privbypackage.html.php | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index 85c359b524..e65e7439d0 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -2,6 +2,7 @@ #mainContainer {display: flex; gap: 16px; height: calc(100vh - 165px);} #mainContainer > .main {flex: 1 1 75%; overflow-y: auto; padding: 0px; border: 1px solid #FFF; box-sizing: content-box;} #mainContainer > .side {flex: 1 1 25%;} +#mainContainer .main .btn-group {position: absolute; top: 3px; display: block !important;} .priv-panel {background: #fff; padding: 10px 16px; box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 5%);} .priv-panel {height: 40%;} .priv-panel .table-empty-tip {padding: calc(15% - 10px) 10px;} @@ -40,7 +41,6 @@ #privList .menus .checkbox-primary:first-child {float: left; width: auto;} #privList .menus a {margin-left: 10px;} -#mainContent .main-content {padding: 2px;} #privList {margin-bottom: 0px;} #privList tr:hover>td {background-color: #FFF;} #privList th.module {width: 142px; min-width: 142px; background-color: #EDEEF28C; font-weight: 600;} diff --git a/module/group/js/managepriv.js b/module/group/js/managepriv.js index 3c62f5621d..22b06267e4 100644 --- a/module/group/js/managepriv.js +++ b/module/group/js/managepriv.js @@ -382,6 +382,9 @@ function recommendChange($item, checked) $(function() { + var btnLeft = $('.main > table').width() - $('.main > .btn-group').width(); + $('.main > .btn-group').css('left', btnLeft + 'px'); + $('.main > .btn-group').removeClass('hidden'); selectedPrivIdList = Object.values(selectedPrivIdList); recommedSelect = new Array(); diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index eaf8d95dde..5e60b3a19a 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -79,6 +79,10 @@
+
diff --git a/module/group/view/privbypackage.html.php b/module/group/view/privbypackage.html.php index ade64c0214..de9656958e 100644 --- a/module/group/view/privbypackage.html.php +++ b/module/group/view/privbypackage.html.php @@ -79,6 +79,10 @@
+
From 423da76974080c29f6f922e17a10954dee070004 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 12 Apr 2023 16:43:35 +0800 Subject: [PATCH 195/347] * Fix bug #34104. --- module/group/model.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/module/group/model.php b/module/group/model.php index c19c89571c..6afc191e6b 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -2084,9 +2084,14 @@ class groupModel extends model */ public function getRelatedPrivs($privIdList, $type = '', $excludePrivs = array(), $recommedSelect = array()) { - $relatedPrivs = $this->dao->select('t1.relationPriv,t1.type,t2.parent,t2.module,t2.method,t3.`key`,t3.value')->from(TABLE_PRIVRELATION)->alias('t1') + $modulePairs = $this->getPrivManagerPairs('module'); + $modules = array_keys($modulePairs); + $modules = implode(',', $modules); + $relatedPrivs = $this->dao->select("t1.relationPriv,t1.type,t2.parent,t2.module,t2.method,t3.`key`,t3.value, IF(t4.type = 'module', 999, INSTR('$modules', t5.code)) as moduleOrder")->from(TABLE_PRIVRELATION)->alias('t1') ->leftJoin(TABLE_PRIV)->alias('t2')->on('t1.relationPriv=t2.id') ->leftJoin(TABLE_PRIVLANG)->alias('t3')->on('t1.relationPriv=t3.objectID') + ->leftJoin(TABLE_PRIVMANAGER)->alias('t4')->on('t2.parent=t4.id') + ->leftJoin(TABLE_PRIVMANAGER)->alias('t5')->on('t4.parent=t5.id') ->where('t1.priv')->in($privIdList) ->andWhere('(t1.relationPriv')->notin($privIdList) @@ -2101,13 +2106,20 @@ class groupModel extends model ->andWhere('t3.objectType')->eq('priv') ->andWhere('t2.edition')->like("%,{$this->config->edition},%") ->andWhere('t2.vision')->like("%,{$this->config->vision},%") - ->orderBy('t2.`order`_asc, t1.`type` desc') + ->andWhere('((t4.type')->eq('package') + ->andWhere('t5.type')->eq('module') + ->beginIF(!empty($view) and $view != 'general')->andWhere('t5.code')->in($modules)->fi() + ->markRight(1) + ->orWhere('(t4.type')->eq('module') + ->andWhere('t5.type')->eq('view') + ->beginIF(!empty($view) and $view != 'general')->andWhere('t1.module')->in($modules)->fi() + ->markRight(2) + ->orderBy('moduleOrder asc, t2.`order`_asc, t1.`type` desc') ->fetchAll('relationPriv'); $privList = empty($type) ? array('depend' => array(), 'recommend' => array()) : array($type => array()); if(empty($relatedPrivs)) return $privList; - $modulePairs = $this->getPrivManagerPairs('module'); $managerList = $this->dao->select('*')->from(TABLE_PRIVMANAGER)->fetchAll('id'); $relatedPrivs = $this->transformPrivLang($relatedPrivs); From b46eeb374efd257e9b70f1e8891cb239b7df8511 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 12 Apr 2023 16:54:21 +0800 Subject: [PATCH 196/347] * Finish task #91012. --- module/group/css/managepriv.css | 6 +++--- module/group/js/managepriv.js | 3 --- module/group/view/privbygroup.html.php | 6 +++--- module/group/view/privbypackage.html.php | 6 +++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index e65e7439d0..178731315a 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -1,8 +1,8 @@ .flex-center {display: flex; justify-content: center; align-items: center;} #mainContainer {display: flex; gap: 16px; height: calc(100vh - 165px);} -#mainContainer > .main {flex: 1 1 75%; overflow-y: auto; padding: 0px; border: 1px solid #FFF; box-sizing: content-box;} +#mainContainer > .main {flex: 1 1 75%; overflow-y: auto; padding: 0px; border: 1px solid #FFF; box-sizing: content-box; position: relative;} #mainContainer > .side {flex: 1 1 25%;} -#mainContainer .main .btn-group {position: absolute; top: 3px; display: block !important;} +#mainContainer .main .btn-group {position: absolute; right: 8px; top: 8px; display: block !important;} .priv-panel {background: #fff; padding: 10px 16px; box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 5%);} .priv-panel {height: 40%;} .priv-panel .table-empty-tip {padding: calc(15% - 10px) 10px;} @@ -63,7 +63,7 @@ main#main {padding-bottom: 0px;} .side .priv-panel {padding: 16px;} -#privPackageList th.module {width: 112px; min-width: 112px; max-width: 112px; background-color: #EDEEF28C; font-weight: 600; padding-left: 20px;} +#privPackageList th.module {width: 112px; min-width: 112px; max-width: 112px; background-color: #EDEEF28C; font-weight: 600; padding-left: 20px; border-color: #FFF;} #privPackageList .module label {padding-left: 0; overflow: visible;} #privPackageList td.package-column {padding: 20px 16px; background-color: #FFF;} #privPackageList div.package {display: inline-block; width: calc(25% - 5px); padding: 10px 0;} diff --git a/module/group/js/managepriv.js b/module/group/js/managepriv.js index 22b06267e4..3c62f5621d 100644 --- a/module/group/js/managepriv.js +++ b/module/group/js/managepriv.js @@ -382,9 +382,6 @@ function recommendChange($item, checked) $(function() { - var btnLeft = $('.main > table').width() - $('.main > .btn-group').width(); - $('.main > .btn-group').css('left', btnLeft + 'px'); - $('.main > .btn-group').removeClass('hidden'); selectedPrivIdList = Object.values(selectedPrivIdList); recommedSelect = new Array(); diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 5e60b3a19a..7c50197072 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -79,9 +79,9 @@
-
diff --git a/module/group/view/privbypackage.html.php b/module/group/view/privbypackage.html.php index de9656958e..5a3082970d 100644 --- a/module/group/view/privbypackage.html.php +++ b/module/group/view/privbypackage.html.php @@ -79,9 +79,9 @@
-
From 840493bf58c69131f8b5ad826e357c30dd46dbd7 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 12 Apr 2023 17:02:14 +0800 Subject: [PATCH 197/347] * Fix bug of view general privs. --- module/group/model.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/group/model.php b/module/group/model.php index 6afc191e6b..0855051a12 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -1533,10 +1533,12 @@ class groupModel extends model ->andWhere('((t3.type')->eq('package') ->andWhere('t4.type')->eq('module') ->beginIF(!empty($view) and $view != 'general')->andWhere('t4.code')->in($modules)->fi() + ->beginIF(!empty($view) and $view == 'general')->andWhere('t4.code')->notin($modules)->fi() ->markRight(1) ->orWhere('(t3.type')->eq('module') ->andWhere('t4.type')->eq('view') - ->beginIF(!empty($view) and $view != 'general')->andWhere('t1.module')->in($modules)->fi() + ->beginIF(!empty($view) and $view != 'general')->andWhere('t3.code')->in($modules)->fi() + ->beginIF(!empty($view) and $view == 'general')->andWhere('t3.code')->notin($modules)->fi() ->markRight(2) ->orderBy("moduleOrder asc, t3.order asc, `order` asc") ->page($pager) From 047d64d67f897eaa5b41f607dd51de2429d0be41 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 12 Apr 2023 17:03:38 +0800 Subject: [PATCH 198/347] * Fix bug. --- module/group/css/managepriv.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index 178731315a..2da3977cf8 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -65,7 +65,7 @@ main#main {padding-bottom: 0px;} #privPackageList th.module {width: 112px; min-width: 112px; max-width: 112px; background-color: #EDEEF28C; font-weight: 600; padding-left: 20px; border-color: #FFF;} #privPackageList .module label {padding-left: 0; overflow: visible;} -#privPackageList td.package-column {padding: 20px 16px; background-color: #FFF;} +#privPackageList td.package-column {padding: 10px 16px; background-color: #FFF;} #privPackageList div.package {display: inline-block; width: calc(25% - 5px); padding: 10px 0;} #privPackageList .package + .package {padding: 0;} #privPackageList .package .check-all {display: inline-block;} From 79a6ed9da48fe462b7d2adcd0c2e8ed0611e90c5 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 12 Apr 2023 17:04:32 +0800 Subject: [PATCH 199/347] * Revert the lang item. --- module/common/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 723940b1b7..cccadd426b 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -258,7 +258,7 @@ $lang->personnel->common = '人员'; $lang->personnel->invest = '投入人员'; $lang->personnel->accessible = '可访问人员'; -$lang->stakeholder->common = '项目干系人'; +$lang->stakeholder->common = '干系人'; $lang->release->common = '发布'; $lang->message->common = '通知'; $lang->mail->common = '邮件'; From 9ea1d36174742363306d0891906a9c8ef788f4dc Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 12 Apr 2023 17:10:53 +0800 Subject: [PATCH 200/347] * Modify css for manage priv. --- module/group/css/managepriv.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index 2da3977cf8..0f13505915 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -2,7 +2,7 @@ #mainContainer {display: flex; gap: 16px; height: calc(100vh - 165px);} #mainContainer > .main {flex: 1 1 75%; overflow-y: auto; padding: 0px; border: 1px solid #FFF; box-sizing: content-box; position: relative;} #mainContainer > .side {flex: 1 1 25%;} -#mainContainer .main .btn-group {position: absolute; right: 8px; top: 8px; display: block !important;} +#mainContainer .main .btn-group {position: absolute; right: 8px; top: 2px; display: block !important;} .priv-panel {background: #fff; padding: 10px 16px; box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 5%);} .priv-panel {height: 40%;} .priv-panel .table-empty-tip {padding: calc(15% - 10px) 10px;} From ebbb87d900e100f81aaec4f9c1b8e218b2c039a6 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 12 Apr 2023 17:15:02 +0800 Subject: [PATCH 201/347] * Fix bug of task #91011, and modify projectbuild to projectplan. --- config/zentaopms.php | 4 ++-- module/group/lang/resource.php | 16 ++++++++-------- module/project/config.php | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index 4992f080bf..78e4fe7fce 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -430,8 +430,8 @@ $config->pipelineTypeList = array('gitlab', 'gogs', 'gitea', 'jenkins', 'sonarqu /* Program privs.*/ $config->programPriv = new stdclass(); -$config->programPriv->noSprint = array('task', 'story', 'tree', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'stakeholder', 'projectrelease', 'requirement'); -$config->programPriv->scrum = array('story', 'requirement', 'productplan', 'tree', 'projectplan', 'projectstory', 'projectrelease', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask'); +$config->programPriv->noSprint = array('task', 'story', 'tree', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'stakeholder', 'projectrelease', 'requirement'); +$config->programPriv->scrum = array('story', 'requirement', 'productplan', 'tree', 'projectplan', 'projectstory', 'projectrelease', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask'); $config->programPriv->waterfall = array_merge($config->programPriv->scrum, array('workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'issue', 'risk', 'opportunity', 'measrecord', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport')); $config->programPriv->agileplus = $config->programPriv->scrum; $config->programPriv->waterfallplus = $config->programPriv->waterfall; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index d90bc4ab29..dbe908fa8d 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -241,9 +241,9 @@ $lang->project->methodOrder[185] = 'manageRepo'; $lang->resource->projectbuild = new stdclass(); $lang->resource->projectbuild->browse = 'browse'; +$lang->resource->projectbuild->view = 'view'; $lang->resource->projectbuild->create = 'create'; $lang->resource->projectbuild->edit = 'edit'; -$lang->resource->projectbuild->view = 'view'; $lang->resource->projectbuild->delete = 'delete'; $lang->resource->projectbuild->linkStory = 'linkStory'; $lang->resource->projectbuild->unlinkStory = 'unlinkStory'; @@ -253,9 +253,9 @@ $lang->resource->projectbuild->unlinkBug = 'unlinkBug'; $lang->resource->projectbuild->batchUnlinkBug = 'batchUnlinkBug'; $lang->projectbuild->methodOrder[5] = 'browse'; -$lang->projectbuild->methodOrder[10] = 'create'; -$lang->projectbuild->methodOrder[15] = 'edit'; -$lang->projectbuild->methodOrder[20] = 'view'; +$lang->projectbuild->methodOrder[10] = 'view'; +$lang->projectbuild->methodOrder[15] = 'create'; +$lang->projectbuild->methodOrder[20] = 'edit'; $lang->projectbuild->methodOrder[25] = 'delete'; $lang->projectbuild->methodOrder[30] = 'linkStory'; $lang->projectbuild->methodOrder[35] = 'unlinkStory'; @@ -270,10 +270,10 @@ $lang->resource->projectplan->create = 'create'; $lang->resource->projectplan->edit = 'edit'; $lang->resource->projectplan->view = 'view'; -$lang->projectbuild->methodOrder[5] = 'browse'; -$lang->projectbuild->methodOrder[10] = 'create'; -$lang->projectbuild->methodOrder[15] = 'edit'; -$lang->projectbuild->methodOrder[20] = 'view'; +$lang->projectplan->methodOrder[5] = 'browse'; +$lang->projectplan->methodOrder[10] = 'create'; +$lang->projectplan->methodOrder[15] = 'edit'; +$lang->projectplan->methodOrder[20] = 'view'; /* Project Story. */ $lang->resource->projectstory = new stdclass(); diff --git a/module/project/config.php b/module/project/config.php index d8222aed4f..475dbe4d52 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -191,7 +191,7 @@ $config->project->search['params']['closedBy'] = array('operator' => '=' $config->project->search['params']['lastEditedDate'] = array('operator' => '=' , 'control' => 'input' , 'values' => '', 'class' => 'date'); $config->project->search['params']['closedDate'] = array('operator' => '=' , 'control' => 'input' , 'values' => '', 'class' => 'date'); -$config->project->noSprintPriv['project'] = array('edit', 'group', 'createGroup', 'managePriv', 'manageMembers', 'manageGroupMember', 'copyGroup', 'editGroup', 'start', 'suspend', 'close', 'activate', 'delete', 'view', 'whitelist', 'addWhitelist', 'unbindWhitelist', 'manageProducts', 'dynamic', 'build', 'bug', 'testcase', 'testtask', 'testreport', 'team', 'unlinkMember'); +$config->project->noSprintPriv['project'] = array('edit', 'group', 'createGroup', 'managePriv', 'manageMembers', 'manageGroupMember', 'copyGroup', 'editGroup', 'start', 'suspend', 'close', 'activate', 'delete', 'view', 'whitelist', 'addWhitelist', 'unbindWhitelist', 'manageProducts', 'dynamic', 'bug', 'testcase', 'testtask', 'testreport', 'team', 'unlinkMember'); $config->project->noSprintPriv['execution'] = array('task', 'grouptask', 'importplanstories', 'importBug', 'story', 'burn', 'computeBurn', 'fixFirst', 'burnData', 'linkStory', 'unlinkStory', 'batchUnlinkStory', 'updateOrder', 'taskKanban', 'printKanban', 'tree', 'treeTask', 'treeStory', 'storyKanban', 'storySort', 'storyEstimate', 'setKanban', 'storyView', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt', 'ganttsetting', 'ganttEdit'); $config->project->noSprintPriv['story'] = array('create', 'batchCreate', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'batchChangePlan', 'batchChangeStage', 'assignTo', 'batchAssignTo', 'activate', 'zeroCase', 'batchEdit', 'import', 'showImport', 'exportTemplate', 'importToLib', 'batchImportToLib', 'relation', 'browse'); $config->project->noSprintPriv['bug'] = array('create', 'confirmBug', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate'); From 01f6f00903b37871a0f1c6449de8d03be17215b5 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 12 Apr 2023 17:18:19 +0800 Subject: [PATCH 202/347] * Fix bug. --- module/group/lang/resource.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index dbe908fa8d..d5154fcd2c 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -270,6 +270,7 @@ $lang->resource->projectplan->create = 'create'; $lang->resource->projectplan->edit = 'edit'; $lang->resource->projectplan->view = 'view'; +if(!isset($lang->projectplan)) $lang->projectplan = new stdclass(); $lang->projectplan->methodOrder[5] = 'browse'; $lang->projectplan->methodOrder[10] = 'create'; $lang->projectplan->methodOrder[15] = 'edit'; From 7a6bc25470810c2e97db5b895b5f4324c8c6ce7d Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 12 Apr 2023 17:22:03 +0800 Subject: [PATCH 203/347] * Fix bug of change version. --- module/group/css/managepriv.css | 2 +- module/group/js/managepriv.js | 2 +- module/group/view/privbygroup.html.php | 1 + module/group/view/privbypackage.html.php | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index 0f13505915..bd518bcef2 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -76,7 +76,7 @@ main#main {padding-bottom: 0px;} #privPackageList .package.open .list-toggle {transform: rotate(90deg);} #privPackageList .package.open .list-toggle:before {transform: rotate(90deg);} #privPackageList .group-item {display: inline-block; width: 158px; margin-bottom: 20px;} -#privPackageList .privs {padding: 20px 20px 0 20px; border: 1px solid #F5F6F8; background-color: #F9FAFB; position: relative; display: block; max-width: unset; box-shadow: unset; margin-top: 0px;} +#privPackageList .privs {padding: 20px 20px 0 20px; border: 1px solid #F5F6F8; background-color: #F9FAFB; position: relative; display: block; max-width: unset; box-shadow: unset; margin-top: 0px; z-index: 1;} #privPackageList .popover .popover-content {display: inline-block; padding: 0;} #privPackageList .popover .arrow {border-bottom-color: #F5F6F8; top: -10px;} #privPackageList .popover .arrow:after {border-bottom-color: #F9FAFB;} diff --git a/module/group/js/managepriv.js b/module/group/js/managepriv.js index 3c62f5621d..156935e5e7 100644 --- a/module/group/js/managepriv.js +++ b/module/group/js/managepriv.js @@ -1,6 +1,6 @@ function showPriv(value) { - location.href = createLink('group', 'managePriv', "type=byGroup¶m="+ groupID + "&menu=&version=" + value); + location.href = createLink('group', 'managePriv', "type=" + type + "¶m="+ groupID + "&menu=&version=" + value); } /** diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 7c50197072..cbc4950634 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -183,6 +183,7 @@ + diff --git a/module/group/view/privbypackage.html.php b/module/group/view/privbypackage.html.php index 5a3082970d..7d984d51f8 100644 --- a/module/group/view/privbypackage.html.php +++ b/module/group/view/privbypackage.html.php @@ -178,6 +178,7 @@ + From 7cf64a23349c80198a0bdb92b81a6eabe752e510 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 12 Apr 2023 18:16:51 +0800 Subject: [PATCH 204/347] * Adjust the way of diff from commit to tag. --- module/group/lang/changelog.php | 119 +++++++++----------------------- tools/privchangelog.php | 14 +--- 2 files changed, 35 insertions(+), 98 deletions(-) diff --git a/module/group/lang/changelog.php b/module/group/lang/changelog.php index fae9d7a079..123add6ac3 100644 --- a/module/group/lang/changelog.php +++ b/module/group/lang/changelog.php @@ -542,9 +542,10 @@ $lang->changelog['16.4'][] = 'sonarqube-browseIssue'; $lang->changelog['16.5_beta1'][] = 'productplan-batchChangeStatus'; $lang->changelog['16.5_beta1'][] = 'custom-required'; +$lang->changelog['17.0.beta1'][] = 'doc-updateOrder'; + $lang->changelog['17.0.beta2'][] = 'kanban-activateSpace'; $lang->changelog['17.0.beta2'][] = 'kanban-activate'; -$lang->changelog['17.0.beta2'][] = 'doc-updateOrder'; $lang->changelog['17.0.beta2'][] = 'custom-kanban'; $lang->changelog['17.1'][] = 'kanban-editLaneColor'; @@ -560,95 +561,51 @@ $lang->changelog['17.2'][] = 'admin-resetPWDSetting'; $lang->changelog['17.3'][] = 'execution-CFD'; $lang->changelog['17.3'][] = 'execution-computeCFD'; $lang->changelog['17.3'][] = 'repo-downloadCode'; -$lang->changelog['17.3'][] = 'gitlab-browseBranchPriv'; -$lang->changelog['17.3'][] = 'gitlab-browseTagPriv'; $lang->changelog['17.3'][] = 'gitea-browse'; $lang->changelog['17.3'][] = 'gitea-create'; $lang->changelog['17.3'][] = 'gitea-edit'; $lang->changelog['17.3'][] = 'gitea-view'; $lang->changelog['17.3'][] = 'gitea-delete'; -$lang->changelog['17.3'][] = 'gitea-bindUser'; $lang->changelog['17.3'][] = 'app-serverLink'; +$lang->changelog['17.4'][] = 'execution-setKanban'; $lang->changelog['17.4'][] = 'custom-code'; +$lang->changelog['17.4'][] = 'gitlab-browseBranchPriv'; +$lang->changelog['17.4'][] = 'gitlab-browseTagPriv'; +$lang->changelog['17.4'][] = 'gitea-bindUser'; $lang->changelog['17.5'][] = 'story-linkStoriesAB'; $lang->changelog['17.5'][] = 'kanban-setting'; -$lang->changelog['17.5'][] = 'execution-setKanban'; $lang->changelog['17.5'][] = 'testcase-exportTemplate'; $lang->changelog['17.5'][] = 'caselib-exportTemplate'; -$lang->changelog['17.5'][] = 'compile-syncCompile'; -$lang->changelog['17.5'][] = 'gogs-browse'; -$lang->changelog['17.5'][] = 'gogs-create'; -$lang->changelog['17.5'][] = 'gogs-edit'; -$lang->changelog['17.5'][] = 'gogs-view'; -$lang->changelog['17.5'][] = 'gogs-delete'; -$lang->changelog['17.5'][] = 'gogs-bindUser'; +$lang->changelog['17.5'][] = 'admin-tableEngine'; $lang->changelog['17.6'][] = 'product-track'; $lang->changelog['17.6'][] = 'story-submitReview'; $lang->changelog['17.6'][] = 'story-recallAction'; $lang->changelog['17.6'][] = 'testcase-zeroCase'; -$lang->changelog['17.6'][] = 'admin-tableEngine'; +$lang->changelog['17.6'][] = 'compile-syncCompile'; +$lang->changelog['17.6'][] = 'gogs-browse'; +$lang->changelog['17.6'][] = 'gogs-create'; +$lang->changelog['17.6'][] = 'gogs-edit'; +$lang->changelog['17.6'][] = 'gogs-view'; +$lang->changelog['17.6'][] = 'gogs-delete'; +$lang->changelog['17.6'][] = 'gogs-bindUser'; -$lang->changelog['17.6.1'][] = 'repo-linkStory'; -$lang->changelog['17.6.1'][] = 'repo-linkBug'; -$lang->changelog['17.6.1'][] = 'repo-linkTask'; -$lang->changelog['17.6.1'][] = 'repo-unlink'; +$lang->changelog['17.6.2'][] = 'report-viewEveryoneAnnual'; -$lang->changelog['17.7'][] = 'project-manageRepo'; -$lang->changelog['17.7'][] = 'projectplan-browse'; -$lang->changelog['17.7'][] = 'projectplan-create'; -$lang->changelog['17.7'][] = 'projectplan-edit'; -$lang->changelog['17.7'][] = 'projectplan-view'; -$lang->changelog['17.7'][] = 'report-viewEveryoneAnnual'; +$lang->changelog['18.0.beta1'][] = 'my-audit'; +$lang->changelog['18.0.beta1'][] = 'project-manageRepo'; +$lang->changelog['18.0.beta1'][] = 'projectplan-browse'; +$lang->changelog['18.0.beta1'][] = 'projectplan-create'; +$lang->changelog['18.0.beta1'][] = 'projectplan-edit'; +$lang->changelog['18.0.beta1'][] = 'projectplan-view'; +$lang->changelog['18.0.beta1'][] = 'execution-treeViewTask'; +$lang->changelog['18.0.beta1'][] = 'execution-treeViewStory'; +$lang->changelog['18.0.beta1'][] = 'execution-kanbanAction'; -$lang->changelog['17.8'][] = 'my-audit'; -$lang->changelog['17.8'][] = 'execution-treeViewTask'; -$lang->changelog['17.8'][] = 'execution-treeViewStory'; +$lang->changelog['18.0.beta2'][] = 'story-relievedTwins'; -$lang->changelog['18.0.beta1'][] = 'projectbuild-create'; -$lang->changelog['18.0.beta1'][] = 'projectbuild-edit'; -$lang->changelog['18.0.beta1'][] = 'projectbuild-view'; -$lang->changelog['18.0.beta1'][] = 'projectbuild-delete'; -$lang->changelog['18.0.beta1'][] = 'projectbuild-linkStory'; -$lang->changelog['18.0.beta1'][] = 'projectbuild-unlinkStory'; -$lang->changelog['18.0.beta1'][] = 'projectbuild-batchUnlinkStory'; -$lang->changelog['18.0.beta1'][] = 'projectbuild-linkBug'; -$lang->changelog['18.0.beta1'][] = 'projectbuild-unlinkBug'; -$lang->changelog['18.0.beta1'][] = 'projectbuild-batchUnlinkBug'; -$lang->changelog['18.0.beta1'][] = 'zahost-browse'; -$lang->changelog['18.0.beta1'][] = 'zahost-create'; -$lang->changelog['18.0.beta1'][] = 'zahost-editAction'; -$lang->changelog['18.0.beta1'][] = 'zahost-deleteAction'; -$lang->changelog['18.0.beta1'][] = 'zahost-browseTemplate'; -$lang->changelog['18.0.beta1'][] = 'zahost-createTemplate'; -$lang->changelog['18.0.beta1'][] = 'zahost-editTemplate'; -$lang->changelog['18.0.beta1'][] = 'zahost-deleteTemplate'; -$lang->changelog['18.0.beta1'][] = 'executionnode-browse'; -$lang->changelog['18.0.beta1'][] = 'executionnode-create'; -$lang->changelog['18.0.beta1'][] = 'executionnode-destroy'; -$lang->changelog['18.0.beta1'][] = 'executionnode-reboot'; -$lang->changelog['18.0.beta1'][] = 'executionnode-suspend'; -$lang->changelog['18.0.beta1'][] = 'executionnode-resume'; -$lang->changelog['18.0.beta1'][] = 'executionnode-getVNC'; -$lang->changelog['18.0.beta1'][] = 'repo-linkStory'; -$lang->changelog['18.0.beta1'][] = 'repo-linkBug'; -$lang->changelog['18.0.beta1'][] = 'repo-linkTask'; -$lang->changelog['18.0.beta1'][] = 'repo-unlink'; - -$lang->changelog['18.0.beta2'][] = 'testcase-showScript'; -$lang->changelog['18.0.beta2'][] = 'testcase-automation'; -$lang->changelog['18.0.beta2'][] = 'zanode-browse'; -$lang->changelog['18.0.beta2'][] = 'zanode-create'; -$lang->changelog['18.0.beta2'][] = 'zanode-destroy'; -$lang->changelog['18.0.beta2'][] = 'zanode-reboot'; -$lang->changelog['18.0.beta2'][] = 'zanode-suspend'; -$lang->changelog['18.0.beta2'][] = 'zanode-resume'; -$lang->changelog['18.0.beta2'][] = 'zanode-getVNC'; - -$lang->changelog['18.0.beta3'][] = 'story-relievedTwins'; -$lang->changelog['18.0.beta3'][] = 'automation-browse'; $lang->changelog['18.0.beta3'][] = 'screen-browse'; $lang->changelog['18.0.beta3'][] = 'screen-view'; $lang->changelog['18.0.beta3'][] = 'report-preview'; @@ -685,33 +642,21 @@ $lang->changelog['18.1'][] = 'zanode-createSnapshot'; $lang->changelog['18.1'][] = 'zanode-editSnapshot'; $lang->changelog['18.1'][] = 'zanode-restoreSnapshot'; $lang->changelog['18.1'][] = 'zanode-deleteSnapshot'; -$lang->changelog['18.1'][] = 'custom-productName'; -$lang->changelog['18.1'][] = 'holiday-createAction'; -$lang->changelog['18.1'][] = 'holiday-editAction'; -$lang->changelog['18.1'][] = 'holiday-deleteAction'; -$lang->changelog['18.1'][] = 'holiday-browse'; -$lang->changelog['18.1'][] = 'holiday-importAction'; $lang->changelog['18.2'][] = 'projectbuild-create'; $lang->changelog['18.2'][] = 'stage-plusBrowse'; $lang->changelog['18.2'][] = 'execution-batchChangeStatus'; +$lang->changelog['18.2'][] = 'custom-productName'; $lang->changelog['18.2'][] = 'custom-executionCommon'; +$lang->changelog['18.2'][] = 'custom-hours'; +$lang->changelog['18.2'][] = 'holiday-createAction'; +$lang->changelog['18.2'][] = 'holiday-editAction'; +$lang->changelog['18.2'][] = 'holiday-deleteAction'; +$lang->changelog['18.2'][] = 'holiday-browse'; +$lang->changelog['18.2'][] = 'holiday-importAction'; -$lang->changelog['18.3'][] = 'custom-hours'; $lang->changelog['18.3'][] = 'custom-percent'; $lang->changelog['18.3'][] = 'custom-beginAndEndDate'; -$lang->changelog['18.3'][] = 'group-editManagePriv'; -$lang->changelog['18.3'][] = 'group-managePrivPackage'; -$lang->changelog['18.3'][] = 'group-createPrivPackage'; -$lang->changelog['18.3'][] = 'group-editPrivPackage'; -$lang->changelog['18.3'][] = 'group-deletePrivPackage'; -$lang->changelog['18.3'][] = 'group-sortPrivPackages'; -$lang->changelog['18.3'][] = 'group-addRelation'; -$lang->changelog['18.3'][] = 'group-deleteRelation'; -$lang->changelog['18.3'][] = 'group-batchDeleteRelation'; -$lang->changelog['18.3'][] = 'group-createPriv'; -$lang->changelog['18.3'][] = 'group-editPriv'; -$lang->changelog['18.3'][] = 'group-deletePriv'; $lang->changelog['18.3'][] = 'editor-index'; $lang->changelog['18.3'][] = 'editor-extend'; $lang->changelog['18.3'][] = 'editor-edit'; diff --git a/tools/privchangelog.php b/tools/privchangelog.php index b1ec1fe32e..80898e6666 100644 --- a/tools/privchangelog.php +++ b/tools/privchangelog.php @@ -1,9 +1,9 @@ $releaseDate) { if($version == $oldVersion) continue; - $oldVersionCommit = trim(shell_exec("git log --oneline --until='$oldDate' --pretty=format:'%h' $resourceFile | head -n 1"), "\n"); - $newVersionCommit = trim(shell_exec("git log --oneline --until='$releaseDate' --pretty=format:'%h' $resourceFile | head -n 1"), "\n"); - if($oldVersionCommit == $newVersionCommit) - { - $oldDate = $releaseDate; - $oldVersion = $version; - continue; - } + $addPrivileges = trim(shell_exec("git diff --ignore-space-change zentaopms_{$oldVersion} zentaopms_{$version} -- $resourceFile | grep '+\$lang->resource' | grep -v 'stdclass'"), "\n"); - $addPrivileges = trim(shell_exec("git diff --ignore-space-change {$oldVersionCommit} {$newVersionCommit} -- $resourceFile | grep '+\$lang->resource' | grep -v 'stdclass'"), "\n"); $addPrivileges = str_replace('+$lang', '$lang', $addPrivileges); if(empty($addPrivileges)) { From ef119b1bf8b40d55b7f003dfbc1183230b928ed8 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 09:00:57 +0800 Subject: [PATCH 205/347] * Adjust the lang item. --- module/group/lang/changelog.php | 4 ++-- module/group/lang/de.php | 5 ++--- module/group/lang/en.php | 5 ++--- module/group/lang/fr.php | 5 ++--- module/group/lang/zh-cn.php | 5 ++--- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/module/group/lang/changelog.php b/module/group/lang/changelog.php index 123add6ac3..4963727acf 100644 --- a/module/group/lang/changelog.php +++ b/module/group/lang/changelog.php @@ -539,8 +539,8 @@ $lang->changelog['16.3'][] = 'sonarqube-reportView'; $lang->changelog['16.4'][] = 'sonarqube-createProject'; $lang->changelog['16.4'][] = 'sonarqube-browseIssue'; -$lang->changelog['16.5_beta1'][] = 'productplan-batchChangeStatus'; -$lang->changelog['16.5_beta1'][] = 'custom-required'; +$lang->changelog['16.5.beta1'][] = 'productplan-batchChangeStatus'; +$lang->changelog['16.5.beta1'][] = 'custom-required'; $lang->changelog['17.0.beta1'][] = 'doc-updateOrder'; diff --git a/module/group/lang/de.php b/module/group/lang/de.php index ccf7ece0e8..5e98615877 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -129,9 +129,7 @@ $lang->group->versions['18_0'] = 'ZenTao18.0'; $lang->group->versions['18_0_beta3'] = 'ZenTao18.0.beta3'; $lang->group->versions['18_0_beta2'] = 'ZenTao18.0.beta2'; $lang->group->versions['18_0_beta1'] = 'ZenTao18.0.beta1'; -$lang->group->versions['17_8'] = 'ZenTao17.8'; -$lang->group->versions['17_7'] = 'ZenTao17.7'; -$lang->group->versions['17_6_1'] = 'ZenTao17.6.1'; +$lang->group->versions['17_6_2'] = 'ZenTao17.6.2'; $lang->group->versions['17_6'] = 'ZenTao17.6'; $lang->group->versions['17_5'] = 'ZenTao17.5'; $lang->group->versions['17_4'] = 'ZenTao17.4'; @@ -139,6 +137,7 @@ $lang->group->versions['17_3'] = 'ZenTao17.3'; $lang->group->versions['17_2'] = 'ZenTao17.2'; $lang->group->versions['17_1'] = 'ZenTao17.1'; $lang->group->versions['17_0_beta2'] = 'ZenTao17.0.beta2'; +$lang->group->versions['17_0_beta1'] = 'ZenTao17.0.beta1'; $lang->group->versions['16_5_beta1'] = 'ZenTao16.5.beta1'; $lang->group->versions['16_4'] = 'ZenTao16.4'; $lang->group->versions['16_3'] = 'ZenTao16.3'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 0631b1091c..b9d240c269 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -129,9 +129,7 @@ $lang->group->versions['18_0'] = 'ZenTao18.0'; $lang->group->versions['18_0_beta3'] = 'ZenTao18.0.beta3'; $lang->group->versions['18_0_beta2'] = 'ZenTao18.0.beta2'; $lang->group->versions['18_0_beta1'] = 'ZenTao18.0.beta1'; -$lang->group->versions['17_8'] = 'ZenTao17.8'; -$lang->group->versions['17_7'] = 'ZenTao17.7'; -$lang->group->versions['17_6_1'] = 'ZenTao17.6.1'; +$lang->group->versions['17_6_2'] = 'ZenTao17.6.2'; $lang->group->versions['17_6'] = 'ZenTao17.6'; $lang->group->versions['17_5'] = 'ZenTao17.5'; $lang->group->versions['17_4'] = 'ZenTao17.4'; @@ -139,6 +137,7 @@ $lang->group->versions['17_3'] = 'ZenTao17.3'; $lang->group->versions['17_2'] = 'ZenTao17.2'; $lang->group->versions['17_1'] = 'ZenTao17.1'; $lang->group->versions['17_0_beta2'] = 'ZenTao17.0.beta2'; +$lang->group->versions['17_0_beta1'] = 'ZenTao17.0.beta1'; $lang->group->versions['16_5_beta1'] = 'ZenTao16.5.beta1'; $lang->group->versions['16_4'] = 'ZenTao16.4'; $lang->group->versions['16_3'] = 'ZenTao16.3'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index bdf1c96b47..3d41f2bb1c 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -129,9 +129,7 @@ $lang->group->versions['18_0'] = 'ZenTao18.0'; $lang->group->versions['18_0_beta3'] = 'ZenTao18.0.beta3'; $lang->group->versions['18_0_beta2'] = 'ZenTao18.0.beta2'; $lang->group->versions['18_0_beta1'] = 'ZenTao18.0.beta1'; -$lang->group->versions['17_8'] = 'ZenTao17.8'; -$lang->group->versions['17_7'] = 'ZenTao17.7'; -$lang->group->versions['17_6_1'] = 'ZenTao17.6.1'; +$lang->group->versions['17_6_2'] = 'ZenTao17.6.2'; $lang->group->versions['17_6'] = 'ZenTao17.6'; $lang->group->versions['17_5'] = 'ZenTao17.5'; $lang->group->versions['17_4'] = 'ZenTao17.4'; @@ -139,6 +137,7 @@ $lang->group->versions['17_3'] = 'ZenTao17.3'; $lang->group->versions['17_2'] = 'ZenTao17.2'; $lang->group->versions['17_1'] = 'ZenTao17.1'; $lang->group->versions['17_0_beta2'] = 'ZenTao17.0.beta2'; +$lang->group->versions['17_0_beta1'] = 'ZenTao17.0.beta1'; $lang->group->versions['16_5_beta1'] = 'ZenTao16.5.beta1'; $lang->group->versions['16_4'] = 'ZenTao16.4'; $lang->group->versions['16_3'] = 'ZenTao16.3'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index a34b952dc9..b0f4b6dbc9 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -129,9 +129,7 @@ $lang->group->versions['18_0'] = '禅道18.0'; $lang->group->versions['18_0_beta3'] = '禅道18.0.beta3'; $lang->group->versions['18_0_beta2'] = '禅道18.0.beta2'; $lang->group->versions['18_0_beta1'] = '禅道18.0.beta1'; -$lang->group->versions['17_8'] = '禅道17.8'; -$lang->group->versions['17_7'] = '禅道17.7'; -$lang->group->versions['17_6_1'] = '禅道17.6.1'; +$lang->group->versions['17_6_2'] = '禅道17.6.2'; $lang->group->versions['17_6'] = '禅道17.6'; $lang->group->versions['17_5'] = '禅道17.5'; $lang->group->versions['17_4'] = '禅道17.4'; @@ -139,6 +137,7 @@ $lang->group->versions['17_3'] = '禅道17.3'; $lang->group->versions['17_2'] = '禅道17.2'; $lang->group->versions['17_1'] = '禅道17.1'; $lang->group->versions['17_0_beta2'] = '禅道17.0.beta2'; +$lang->group->versions['17_0_beta1'] = '禅道17.0.beta1'; $lang->group->versions['16_5_beta1'] = '禅道16.5.beta1'; $lang->group->versions['16_4'] = '禅道16.4'; $lang->group->versions['16_3'] = '禅道16.3'; From 0e9dea15cb6331802c6d1e2e5075299d5447b07a Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 09:10:18 +0800 Subject: [PATCH 206/347] * Fix bug of manage priv btn. --- module/group/css/managepriv.css | 4 ++-- module/group/js/managepriv.js | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index bd518bcef2..73e9cc1c93 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -1,8 +1,8 @@ .flex-center {display: flex; justify-content: center; align-items: center;} #mainContainer {display: flex; gap: 16px; height: calc(100vh - 165px);} -#mainContainer > .main {flex: 1 1 75%; overflow-y: auto; padding: 0px; border: 1px solid #FFF; box-sizing: content-box; position: relative;} +#mainContainer > .main {flex: 1 1 75%; overflow-y: auto; padding: 0px; border: 1px solid #FFF; box-sizing: content-box;} #mainContainer > .side {flex: 1 1 25%;} -#mainContainer .main .btn-group {position: absolute; right: 8px; top: 2px; display: block !important;} +#mainContainer .main .btn-group {position: absolute; visibility: hidden; top: 2px; display: inline-block;} .priv-panel {background: #fff; padding: 10px 16px; box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 5%);} .priv-panel {height: 40%;} .priv-panel .table-empty-tip {padding: calc(15% - 10px) 10px;} diff --git a/module/group/js/managepriv.js b/module/group/js/managepriv.js index 156935e5e7..24274acf22 100644 --- a/module/group/js/managepriv.js +++ b/module/group/js/managepriv.js @@ -380,8 +380,23 @@ function recommendChange($item, checked) } } +/** + * Change btn position. + * + * @access public + * @return void + */ +function positionBtn() +{ + var btnLeft = $('.main.main-content > table').width() - 63; + $('.main.main-content > .btn-group').css('left', btnLeft).css('visibility', 'unset'); +} + $(function() { + positionBtn(); + $('.main.main-content').resize(positionBtn); + selectedPrivIdList = Object.values(selectedPrivIdList); recommedSelect = new Array(); From 3b1e48c0dc562c1943d70295fa4e223719535ef4 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 13:34:02 +0800 Subject: [PATCH 207/347] * Modify css of manage priv by package. --- module/group/css/managepriv.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index 73e9cc1c93..06fb897684 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -75,7 +75,7 @@ main#main {padding-bottom: 0px;} #privPackageList .package .list-toggle:before {content: "\f0da";} #privPackageList .package.open .list-toggle {transform: rotate(90deg);} #privPackageList .package.open .list-toggle:before {transform: rotate(90deg);} -#privPackageList .group-item {display: inline-block; width: 158px; margin-bottom: 20px;} +#privPackageList .group-item {display: inline-block; width: 158px; margin-bottom: 15px;} #privPackageList .privs {padding: 20px 20px 0 20px; border: 1px solid #F5F6F8; background-color: #F9FAFB; position: relative; display: block; max-width: unset; box-shadow: unset; margin-top: 0px; z-index: 1;} #privPackageList .popover .popover-content {display: inline-block; padding: 0;} #privPackageList .popover .arrow {border-bottom-color: #F5F6F8; top: -10px;} From f197999e4282e48c95a2190681865ee775b34204 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 14:28:37 +0800 Subject: [PATCH 208/347] - Delete the privilege of product-build. --- module/group/lang/resource.php | 10 ++--- module/product/control.php | 37 --------------- module/product/lang/de.php | 1 - module/product/lang/fr.php | 1 - module/product/lang/vi.php | 1 - module/product/lang/zh-cn.php | 1 - module/product/view/build.html.php | 72 ------------------------------ 7 files changed, 4 insertions(+), 119 deletions(-) delete mode 100644 module/product/view/build.html.php diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index d5154fcd2c..a722aa555d 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -474,7 +474,6 @@ $lang->resource->product->updateOrder = 'orderAction'; $lang->resource->product->all = 'list'; $lang->resource->product->kanban = 'kanban'; $lang->resource->product->manageLine = 'manageLine'; -$lang->resource->product->build = 'build'; $lang->resource->product->export = 'exportAction'; $lang->resource->product->whitelist = 'whitelist'; $lang->resource->product->addWhitelist = 'addWhitelist'; @@ -498,11 +497,10 @@ $lang->product->methodOrder[70] = 'updateOrder'; $lang->product->methodOrder[75] = 'all'; $lang->product->methodOrder[80] = 'kanban'; $lang->product->methodOrder[85] = 'manageLine'; -$lang->product->methodOrder[90] = 'build'; -$lang->product->methodOrder[95] = 'export'; -$lang->product->methodOrder[100] = 'whitelist'; -$lang->product->methodOrder[105] = 'addWhitelist'; -$lang->product->methodOrder[110] = 'unbindWhitelist'; +$lang->product->methodOrder[90] = 'export'; +$lang->product->methodOrder[95] = 'whitelist'; +$lang->product->methodOrder[100] = 'addWhitelist'; +$lang->product->methodOrder[105] = 'unbindWhitelist'; /* Branch. */ $lang->resource->branch = new stdclass(); diff --git a/module/product/control.php b/module/product/control.php index 9a1ecb7e49..968a42bfd1 100755 --- a/module/product/control.php +++ b/module/product/control.php @@ -1538,43 +1538,6 @@ class product extends control $this->display(); } - /** - * Build of product. - * - * @param int $productID - * @access public - * @return void - */ - public function build($productID = 0, $branch = 0) - { - $this->app->loadLang('build'); - $this->session->set('productList', $this->app->getURI(true), 'product'); - - /* Get all product list. Locate to the create product page if there is no product. */ - $this->products = $this->product->getPairs('', $this->session->project); - if(empty($this->products) and strpos('create|view', $this->methodName) === false) $this->locate($this->createLink('product', 'create')); - - /* Get current product. */ - $productID = $this->product->saveState($productID, $this->products); - $product = $this->product->getById($productID); - $this->product->setMenu($productID, $branch); - - /* Set menu.*/ - $this->session->set('buildList', $this->app->getURI(true), 'execution'); - - $this->view->title = $product->name . $this->lang->colon . $this->lang->product->build; - $this->view->position[] = $this->lang->product->build; - $this->view->products = $this->products; - $this->view->product = $product; - $this->view->builds = $this->dao->select('*')->from(TABLE_BUILD)->where('product')->eq($productID) - ->beginIF($branch)->andWhere('branch')->eq($branch)->fi() - ->andWhere('deleted')->eq(0) - ->fetchAll(); - $this->view->users = $this->loadModel('user')->getPairs('noletter'); - - $this->display(); - } - /** * Set product id to session in ajax * diff --git a/module/product/lang/de.php b/module/product/lang/de.php index cfa3b39838..e2a9143524 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -60,7 +60,6 @@ $lang->product->builds = 'Builds'; $lang->product->roadmap = 'Roadmap'; $lang->product->doc = 'Dok'; $lang->product->project = $lang->executionCommon . 'Liste'; -$lang->product->build = 'Build'; $lang->product->moreProduct = "More {$lang->productCommon}"; $lang->product->projectInfo = "My {$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below."; $lang->product->progress = "Progress"; diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php index 5f31683673..4918c58c04 100644 --- a/module/product/lang/fr.php +++ b/module/product/lang/fr.php @@ -60,7 +60,6 @@ $lang->product->builds = 'Build'; $lang->product->roadmap = "Roadmap {$lang->productCommon}"; $lang->product->doc = "Documents {$lang->productCommon}"; $lang->product->project = ' Liste ' . $lang->executionCommon; -$lang->product->build = 'Liste Builds'; $lang->product->moreProduct = "More {$lang->productCommon}"; $lang->product->projectInfo = "My {$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below."; $lang->product->progress = "Progress"; diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php index f166420a33..299ed0c4d6 100644 --- a/module/product/lang/vi.php +++ b/module/product/lang/vi.php @@ -48,7 +48,6 @@ $lang->product->builds = 'Bản dựng'; $lang->product->roadmap = "Lộ trình {$lang->productCommon}"; $lang->product->doc = "Tài liệu {$lang->productCommon}"; $lang->product->project = 'Danh sách '.$lang->executionCommon; -$lang->product->build = 'Danh sách bản dựng'; $lang->product->moreProduct = "More Product"; $lang->product->projectInfo = "Projects đã liên kết tới {$lang->productCommon} này được liệt kê bên dưới."; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 6c9180c31c..3fdd89cfae 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -60,7 +60,6 @@ $lang->product->builds = '版本数'; $lang->product->roadmap = "{$lang->productCommon}路线图"; $lang->product->doc = '文档列表'; $lang->product->project = $lang->executionCommon . '列表'; -$lang->product->build = '版本列表'; $lang->product->moreProduct = "更多{$lang->productCommon}"; $lang->product->projectInfo = "所有与此{$lang->productCommon}关联的我参与的{$lang->projectCommon}"; $lang->product->progress = "{$lang->productCommon}完成度"; diff --git a/module/product/view/build.html.php b/module/product/view/build.html.php deleted file mode 100644 index 0323e700c1..0000000000 --- a/module/product/view/build.html.php +++ /dev/null @@ -1,72 +0,0 @@ - - * @package product - * @version $Id - * @link http://www.zentao.net - */ -?> - -build->confirmDelete)?> -global->flow == 'full'):?> - - -
- -
-

- build->noBuild;?> - - createLink('build', 'create', "productID=$product->id"), " " . $lang->build->create, '', "class='btn btn-info'");?> - -

-
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
build->id;?>build->name;?>build->scmPath;?>build->filePath;?>build->date;?>build->builder;?>actions;?>
id;?>createLink('build', 'view', "build=$build->id"), $build->name);?>scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?>filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?>date?>builder);?> - id&project=0&build=$build->id", '', 'list', 'bullhorn'); - common::printIcon('build', 'edit', "buildID=$build->id", '', 'list'); - if(common::hasPriv('build', 'delete')) - { - $deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"buildList\", confirmDelete)", '', '', "class='btn' title='{$lang->build->delete}'"); - } - ?> -
- -
- From 07430ea118dcfcd3dd842be94a9ceb4824c8d911 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 14:32:38 +0800 Subject: [PATCH 209/347] - Delete the privilege of project-qa. --- module/group/lang/resource.php | 22 ++++++++++------------ module/project/control.php | 14 -------------- module/project/lang/de.php | 1 - module/project/lang/en.php | 1 - module/project/lang/fr.php | 1 - module/project/lang/vi.php | 1 - module/project/lang/zh-cn.php | 1 - 7 files changed, 10 insertions(+), 31 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index a722aa555d..27cadb7938 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -187,7 +187,6 @@ $lang->resource->project->addWhitelist = 'addWhitelist'; $lang->resource->project->unbindWhitelist = 'unbindWhitelist'; $lang->resource->project->manageProducts = 'manageProducts'; $lang->resource->project->dynamic = 'dynamic'; -$lang->resource->project->qa = 'qa'; $lang->resource->project->bug = 'bug'; $lang->resource->project->testcase = 'testcase'; $lang->resource->project->testtask = 'testtask'; @@ -227,17 +226,16 @@ $lang->project->methodOrder[115] = 'unbindWhitelist'; $lang->project->methodOrder[120] = 'manageProducts'; $lang->project->methodOrder[125] = 'view'; $lang->project->methodOrder[130] = 'dynamic'; -$lang->project->methodOrder[135] = 'qa'; -$lang->project->methodOrder[140] = 'bug'; -$lang->project->methodOrder[145] = 'testcase'; -$lang->project->methodOrder[150] = 'testtask'; -$lang->project->methodOrder[155] = 'testreport'; -$lang->project->methodOrder[160] = 'execution'; -$lang->project->methodOrder[165] = 'export'; -$lang->project->methodOrder[170] = 'updateOrder'; -$lang->project->methodOrder[175] = 'team'; -$lang->project->methodOrder[180] = 'unlinkMember'; -$lang->project->methodOrder[185] = 'manageRepo'; +$lang->project->methodOrder[135] = 'bug'; +$lang->project->methodOrder[140] = 'testcase'; +$lang->project->methodOrder[145] = 'testtask'; +$lang->project->methodOrder[150] = 'testreport'; +$lang->project->methodOrder[155] = 'execution'; +$lang->project->methodOrder[160] = 'export'; +$lang->project->methodOrder[165] = 'updateOrder'; +$lang->project->methodOrder[170] = 'team'; +$lang->project->methodOrder[175] = 'unlinkMember'; +$lang->project->methodOrder[180] = 'manageRepo'; $lang->resource->projectbuild = new stdclass(); $lang->resource->projectbuild->browse = 'browse'; diff --git a/module/project/control.php b/module/project/control.php index efefdbe554..8ff610c4a2 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -1140,20 +1140,6 @@ class project extends control $this->display(); } - /** - * Project qa dashboard. - * - * @param int $projectID - * @access public - * @return void - */ - public function qa($projectID = 0) - { - $this->project->setMenu($projectID); - $this->view->title = $this->lang->project->qa; - $this->display(); - } - /** * Project bug list. * diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 1104c1ebd5..b4f45a2339 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -30,7 +30,6 @@ $lang->project->moduleSetting = 'List Settings'; $lang->project->moduleOpen = 'Program Name'; $lang->project->dynamic = 'Dynamic'; $lang->project->execution = 'Execution'; -$lang->project->qa = 'QA'; $lang->project->bug = 'Bug List'; $lang->project->testcase = 'Case List'; $lang->project->testtask = 'Test Task'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 1104c1ebd5..b4f45a2339 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -30,7 +30,6 @@ $lang->project->moduleSetting = 'List Settings'; $lang->project->moduleOpen = 'Program Name'; $lang->project->dynamic = 'Dynamic'; $lang->project->execution = 'Execution'; -$lang->project->qa = 'QA'; $lang->project->bug = 'Bug List'; $lang->project->testcase = 'Case List'; $lang->project->testtask = 'Test Task'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index 1104c1ebd5..b4f45a2339 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -30,7 +30,6 @@ $lang->project->moduleSetting = 'List Settings'; $lang->project->moduleOpen = 'Program Name'; $lang->project->dynamic = 'Dynamic'; $lang->project->execution = 'Execution'; -$lang->project->qa = 'QA'; $lang->project->bug = 'Bug List'; $lang->project->testcase = 'Case List'; $lang->project->testtask = 'Test Task'; diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php index 3dc375ce0a..6b04c38c27 100644 --- a/module/project/lang/vi.php +++ b/module/project/lang/vi.php @@ -30,7 +30,6 @@ $lang->project->moduleSetting = 'List Settings'; $lang->project->moduleOpen = 'Program Name'; $lang->project->dynamic = 'Dynamic'; $lang->project->execution = 'Execution'; -$lang->project->qa = 'QA'; $lang->project->bug = 'Bug List'; $lang->project->testcase = 'Case List'; $lang->project->testtask = 'Test Task'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index a720e3b6c1..8a6c04d904 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -30,7 +30,6 @@ $lang->project->moduleSetting = '列表设置'; $lang->project->moduleOpen = '显示项目集名'; $lang->project->dynamic = '动态'; $lang->project->execution = '执行列表'; -$lang->project->qa = '测试仪表盘'; $lang->project->bug = 'Bug列表'; $lang->project->testcase = '用例列表'; $lang->project->testtask = '测试单'; From 090456cf53994a5ea87a09d1e14a08d09bc87b88 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 14:35:46 +0800 Subject: [PATCH 210/347] - Delete the privilege of project-qa. --- module/project/view/qa.html.php | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 module/project/view/qa.html.php diff --git a/module/project/view/qa.html.php b/module/project/view/qa.html.php deleted file mode 100644 index 679560fa37..0000000000 --- a/module/project/view/qa.html.php +++ /dev/null @@ -1,2 +0,0 @@ - - From bd6ada9429aa6291c3ed1c6f9199142314c9dbf5 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 14:47:06 +0800 Subject: [PATCH 211/347] - Delete the privilege of project-manageRepo. --- module/common/lang/menu.php | 2 - module/group/lang/resource.php | 2 - module/project/control.php | 32 ----------- module/project/lang/de.php | 3 - module/project/lang/en.php | 3 - module/project/lang/fr.php | 3 - module/project/lang/zh-cn.php | 3 - module/project/model.php | 75 ------------------------- module/project/view/managerepo.html.php | 59 ------------------- 9 files changed, 182 deletions(-) delete mode 100644 module/project/view/managerepo.html.php diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 4ed14ad14d..05ea4a7fa7 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -250,7 +250,6 @@ $lang->scrum->menu->settings['subMenu']->whitelist = array('link' => "{$lang-> $lang->scrum->menu->settings['subMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|project=%s", 'subModule' => 'stakeholder'); $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang->priv}|project|group|project=%s", 'alias' => 'group,manageview,managepriv'); $lang->scrum->menu->settings['subMenu']->module = array('link' => "{$lang->module}|tree|browse|product=%s&view=story"); -//$lang->scrum->menu->settings['subMenu']->managerepo = array('link' => "{$lang->repo->codeRepo}|project|managerepo|project=%s"); /* Waterfall menu. */ $lang->waterfall->menu = new stdclass(); @@ -727,7 +726,6 @@ if(!helper::hasFeature('devops')) unset($lang->waterfall->menu->devops, $lang->waterfall->menuOrder[35]); unset($lang->execution->menu->devops, $lang->execution->menuOrder[45]); unset($lang->project->noMultiple->scrum->menu->devops, $lang->project->noMultiple->scrum->menuOrder[35]); - unset($lang->scrum->menu->settings['subMenu']->managerepo); } if(!helper::hasFeature('kanban')) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 27cadb7938..46f9f5ec3c 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -197,7 +197,6 @@ $lang->resource->project->updateOrder = 'updateOrder'; $lang->resource->project->team = 'teamAction'; $lang->resource->project->unlinkMember = 'unlinkMember'; $lang->resource->project->programTitle = 'moduleOpen'; -$lang->resource->project->manageRepo = 'manageRepo'; $lang->project->methodOrder[0] = 'index'; $lang->project->methodOrder[5] = 'browse'; @@ -235,7 +234,6 @@ $lang->project->methodOrder[160] = 'export'; $lang->project->methodOrder[165] = 'updateOrder'; $lang->project->methodOrder[170] = 'team'; $lang->project->methodOrder[175] = 'unlinkMember'; -$lang->project->methodOrder[180] = 'manageRepo'; $lang->resource->projectbuild = new stdclass(); $lang->resource->projectbuild->browse = 'browse'; diff --git a/module/project/control.php b/module/project/control.php index 8ff610c4a2..9ef7da51d2 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -2376,36 +2376,4 @@ class project extends control return print(html::select('project', $projectPairs, $execution->project, "class='form-control' onchange='loadProductExecutions({$execution->project}, this.value)'")); } } - - /** - * Link projects and code repositories. - * - * @param int $projectID - * @access public - * @return void - */ - public function manageRepo($projectID) - { - $this->project->setMenu($projectID); - - if($_POST) - { - $postData = fixer::input('post')->setDefault('repos', array())->get(); - - $this->project->updateRepoRelations($projectID, $postData->repos); - if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => $this->lang->project->linkRepoFailed)); - - $locateLink = inLink('manageRepo', "projectID=$projectID"); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink)); - } - - $this->view->title = $this->lang->project->manageRepo; - $this->view->allRepos = $this->loadModel('repo')->getRepoPairs(''); - $this->view->linkedRepos = $this->project->linkedRepoPairs($projectID); - $this->view->unlinkedRepos = array(); - - foreach($this->view->allRepos as $repoID => $repoName) if(!isset($this->view->linkedRepos[$repoID])) $this->view->unlinkedRepos[$repoID] = $repoName; - - $this->display(); - } } diff --git a/module/project/lang/de.php b/module/project/lang/de.php index b4f45a2339..b2434531a8 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -65,9 +65,6 @@ $lang->project->budgetNumber = '『Budget』must be numbers.'; $lang->project->budgetGe0 = '『Budget』must be greater than or equal to 0.'; $lang->project->allProjects = "All {$lang->projectCommon}s"; $lang->project->ignore = 'Ignore'; -$lang->project->manageRepo = 'Manage Repo'; -$lang->project->linkedRepo = 'Link Repo'; -$lang->project->unlinkedRepo = 'Unlink Repo'; $lang->project->disableExecution = "{$lang->projectCommon} of disable {$lang->executionCommon}"; $lang->project->selectProduct = "Select {$lang->productCommon}"; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index b4f45a2339..b2434531a8 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -65,9 +65,6 @@ $lang->project->budgetNumber = '『Budget』must be numbers.'; $lang->project->budgetGe0 = '『Budget』must be greater than or equal to 0.'; $lang->project->allProjects = "All {$lang->projectCommon}s"; $lang->project->ignore = 'Ignore'; -$lang->project->manageRepo = 'Manage Repo'; -$lang->project->linkedRepo = 'Link Repo'; -$lang->project->unlinkedRepo = 'Unlink Repo'; $lang->project->disableExecution = "{$lang->projectCommon} of disable {$lang->executionCommon}"; $lang->project->selectProduct = "Select {$lang->productCommon}"; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index b4f45a2339..b2434531a8 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -65,9 +65,6 @@ $lang->project->budgetNumber = '『Budget』must be numbers.'; $lang->project->budgetGe0 = '『Budget』must be greater than or equal to 0.'; $lang->project->allProjects = "All {$lang->projectCommon}s"; $lang->project->ignore = 'Ignore'; -$lang->project->manageRepo = 'Manage Repo'; -$lang->project->linkedRepo = 'Link Repo'; -$lang->project->unlinkedRepo = 'Unlink Repo'; $lang->project->disableExecution = "{$lang->projectCommon} of disable {$lang->executionCommon}"; $lang->project->selectProduct = "Select {$lang->productCommon}"; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 8a6c04d904..cfa297cab8 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -65,9 +65,6 @@ $lang->project->budgetNumber = '『预算』金额必须为数字。'; $lang->project->budgetGe0 = '『预算』金额必须大于等于0。'; $lang->project->allProjects = "所有{$lang->projectCommon}"; $lang->project->ignore = '忽略'; -$lang->project->manageRepo = '关联代码库'; -$lang->project->linkedRepo = '已关联代码库'; -$lang->project->unlinkedRepo = '未关联代码库'; $lang->project->disableExecution = "不启用{$lang->executionCommon}的{$lang->projectCommon}"; $lang->project->selectProduct = "选择{$lang->productCommon}"; diff --git a/module/project/model.php b/module/project/model.php index 1ee37eb913..fd3b904c54 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2858,7 +2858,6 @@ class projectModel extends model else { unset($lang->project->menu->settings['subMenu']->module); - unset($lang->project->menu->settings['subMenu']->managerepo); unset($lang->project->menu->projectplan); } @@ -2995,7 +2994,6 @@ class projectModel extends model else { unset($this->lang->project->menu->settings['subMenu']->module); - unset($this->lang->project->menu->settings['subMenu']->managerepo); unset($this->lang->project->menu->projectplan); } @@ -3170,79 +3168,6 @@ class projectModel extends model return $menu; } - /** - * Update linked repos. This method only for project without product. - * - * @param int $projectID - * @param array $repos - * @access public - * @return void - */ - public function updateRepoRelations($projectID, $repos) - { - $this->loadModel('action'); - $this->loadModel('product'); - - $linkedRepos = $this->dao->select('*')->from(TABLE_REPO) - ->where('deleted')->eq(0) - ->andWhere("CONCAT(',', projects, ',')")->like("%,$projectID,%") - ->fetchAll('id'); - - /* 1. Delete old relations. */ - /* Get relations should be deleted. */ - $shouldDeleteRepos = array_diff(array_keys($linkedRepos), $repos); - foreach($shouldDeleteRepos as $repoID) - { - /* Remove project id form this repo. */ - $repo = zget($linkedRepos, $repoID, null); - $oldProjects = explode(',', $repo->projects); - $newProjects = array_filter($oldProjects, function($oldProjectID) use ($projectID) - { - return $projectID != $oldProjectID; - }); - - /* Remove products */ - $shadowProduct = $this->loadModel('product')->getShadowProductByProject($projectID); - $oldProducts = explode(',', $repo->product); - $newProducts = array_filter($oldProducts, function($oldProductID)use($shadowProduct) - { - return $oldProductID != $shadowProduct->id; - }); - - $this->dao->update(TABLE_REPO) - ->set('product')->eq(implode(',', $newProducts)) - ->set('projects')->eq(implode(',', $newProjects)) - ->where('id')->eq($repo->id)->exec(); - - /* Save action log. */ - $this->action->create('project', $projectID, 'unlinkedRepo', $repo->name); - } - - /* 2. Add new relations. */ - $products = $this->product->getProductPairsByProject($projectID); // There will be only one (shadow) product for project without product. - $addedProducts = array_keys($products); - - $addedRepos = array_diff($repos, array_keys($linkedRepos)); - $newRepos = $this->dao->select('*')->from(TABLE_REPO)->where('id')->in($addedRepos)->fetchAll(); - foreach($newRepos as $repo) - { - $oldProducts = explode(',', $repo->product); - $newProducts = array_merge($oldProducts, $addedProducts); - $newProducts = array_unique($newProducts); - - $oldProjects = explode(',', $repo->projects); - $oldProjects[] = $projectID; - $newProjects = array_unique($oldProjects); - - $this->dao->update(TABLE_REPO) - ->set('product')->eq(implode(',', $newProducts)) - ->set('projects')->eq(implode(',', $newProjects)) - ->where('id')->eq($repo->id)->exec(); - - $this->action->create('project', $projectID, 'linkedRepo', '', $repo->name); - } - } - /** * Get linked repo pairs by project id. * diff --git a/module/project/view/managerepo.html.php b/module/project/view/managerepo.html.php deleted file mode 100644 index fece52db92..0000000000 --- a/module/project/view/managerepo.html.php +++ /dev/null @@ -1,59 +0,0 @@ - - * @package project - * @version $Id - * @link http://www.zentao.net - */ -?> - - -
-
-
-
-
project->linkedRepo;?>
-
- $repoName):?> -
-
-
- ";?> - -
-
-
- -
-
-
-
project->unlinkedRepo;?>
-
- $repoName):?> -
-
-
- ";?> - -
-
-
- -
-
-
- - -
-
-
-
- From 035d8a3a195742888a539d4756cf08d422a97736 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 14:47:06 +0800 Subject: [PATCH 212/347] - Delete the privilege of stakeholder-viewIssue. --- module/group/lang/resource.php | 2 - module/group/model.php | 6 +-- module/stakeholder/control.php | 17 -------- module/stakeholder/lang/de.php | 4 +- module/stakeholder/lang/en.php | 4 +- module/stakeholder/lang/fr.php | 4 +- module/stakeholder/lang/zh-cn.php | 4 +- module/stakeholder/view/userissue.html.php | 2 +- module/stakeholder/view/viewissue.html.php | 51 ---------------------- 9 files changed, 8 insertions(+), 86 deletions(-) delete mode 100644 module/stakeholder/view/viewissue.html.php diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 27cadb7938..c2ebab27d7 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -332,7 +332,6 @@ $lang->resource->stakeholder->edit = 'edit'; $lang->resource->stakeholder->delete = 'delete'; $lang->resource->stakeholder->view = 'viewAction'; $lang->resource->stakeholder->issue = 'issue'; -$lang->resource->stakeholder->viewIssue = 'viewIssueAction'; $lang->resource->stakeholder->communicate = 'communicate'; $lang->resource->stakeholder->expect = 'expect'; $lang->resource->stakeholder->expectation = 'expectation'; @@ -349,7 +348,6 @@ $lang->stakeholder->methodOrder[15] = 'edit'; $lang->stakeholder->methodOrder[25] = 'delete'; $lang->stakeholder->methodOrder[30] = 'view'; $lang->stakeholder->methodOrder[35] = 'issue'; -$lang->stakeholder->methodOrder[40] = 'viewIssue'; $lang->stakeholder->methodOrder[45] = 'communicate'; $lang->stakeholder->methodOrder[50] = 'expect'; $lang->stakeholder->methodOrder[55] = 'expectation'; diff --git a/module/group/model.php b/module/group/model.php index 7038699eb3..60b49e19c4 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -1164,12 +1164,12 @@ class groupModel extends model */ public function initData() { - $allResourceFile = "/home/hufangzhou/repo/zentaopms/module/group/lang/allresources.php"; + $allResourceFile = $this->app->getModuleRoot() . "/group/lang/allresources.php"; $views = $this->loadModel('setting')->getItem("owner=system&module=priv&key=views"); $views = explode(',', $views); $views[] = 'general'; - ///* 获取权限相关数据 */ - //if(!file_exists("$allResourceFile")) die("Please execute the commands: touch $allResourceFile; chmod 777 $allResourceFile"); + /* 获取权限相关数据 */ + if(!file_exists("$allResourceFile")) die("Please execute the commands: touch $allResourceFile; chmod 777 $allResourceFile"); //$resourceContents = file_get_contents($allResourceFile); //if(!$resourceContents) file_put_contents($allResourceFile, "display(); } - /** - * View activity's issues. - * - * @access public - * @return void - */ - public function viewIssue($activityID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1) - { - $this->app->loadClass('pager', true); - $pager = pager::init($recTotal, $recPerPage, $pageID); - - $this->view->users = $this->loadModel('user')->getPairs('all|noletter'); - $this->view->activity = $this->dao->findByID($activityID)->from(TABLE_ACTIVITY)->fetch(); - $this->view->issues = $this->loadModel('issue')->getStakeholderIssue('', $activityID, $pager); - $this->display(); - } - /** * Add communication record. * diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php index 25bbd57899..f6bf36bfc4 100644 --- a/module/stakeholder/lang/de.php +++ b/module/stakeholder/lang/de.php @@ -23,12 +23,10 @@ $lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; -$lang->stakeholder->viewIssue = 'Active Issues'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; $lang->stakeholder->deleted = 'Deleted'; -$lang->stakeholder->viewAction = 'View Stakeholder'; -$lang->stakeholder->viewIssueAction = 'Issue List'; +$lang->stakeholder->viewAction = 'View Stakeholder'; /* Fields. */ $lang->stakeholder->id = 'ID'; diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php index 767758ac5f..348886985f 100644 --- a/module/stakeholder/lang/en.php +++ b/module/stakeholder/lang/en.php @@ -23,12 +23,10 @@ $lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; -$lang->stakeholder->viewIssue = 'Active Issues'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; $lang->stakeholder->deleted = 'Deleted'; -$lang->stakeholder->viewAction = 'View Stakeholder'; -$lang->stakeholder->viewIssueAction = 'Issue List'; +$lang->stakeholder->viewAction = 'View Stakeholder'; /* Fields. */ $lang->stakeholder->id = 'ID'; diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php index 25bbd57899..f6bf36bfc4 100644 --- a/module/stakeholder/lang/fr.php +++ b/module/stakeholder/lang/fr.php @@ -23,12 +23,10 @@ $lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; -$lang->stakeholder->viewIssue = 'Active Issues'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; $lang->stakeholder->deleted = 'Deleted'; -$lang->stakeholder->viewAction = 'View Stakeholder'; -$lang->stakeholder->viewIssueAction = 'Issue List'; +$lang->stakeholder->viewAction = 'View Stakeholder'; /* Fields. */ $lang->stakeholder->id = 'ID'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index ca20f378ac..b474241cd5 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -23,12 +23,10 @@ $lang->stakeholder->deleteExpect = '删除期望'; $lang->stakeholder->editExpect = '编辑期望'; $lang->stakeholder->viewExpect = '期望信息'; $lang->stakeholder->issue = '问题管理'; -$lang->stakeholder->viewIssue = '活动问题列表'; $lang->stakeholder->userIssue = '干系人问题列表'; $lang->stakeholder->deleted = '已删除'; -$lang->stakeholder->viewAction = '干系人详情'; -$lang->stakeholder->viewIssueAction = '问题列表'; +$lang->stakeholder->viewAction = '干系人详情'; /* Fields. */ $lang->stakeholder->id = '编号'; diff --git a/module/stakeholder/view/userissue.html.php b/module/stakeholder/view/userissue.html.php index 02f35ce17d..90de89d587 100644 --- a/module/stakeholder/view/userissue.html.php +++ b/module/stakeholder/view/userissue.html.php @@ -15,7 +15,7 @@

- stakeholder->viewIssue;?> + stakeholder->userIssue;?>

user, " " . $lang->issue->create, '', "class='btn btn-primary'");?> diff --git a/module/stakeholder/view/viewissue.html.php b/module/stakeholder/view/viewissue.html.php deleted file mode 100644 index 91ed3a2677..0000000000 --- a/module/stakeholder/view/viewissue.html.php +++ /dev/null @@ -1,51 +0,0 @@ - - -
-
-
-

- id;?> - name. '">' . $activity->name. '') . $lang->arrow . $lang->stakeholder->viewIssue : html::a($this->createLink('activity', 'view', 'activity=' . $activity->id), $activity->name);?> - - -

-
- id, " " . $lang->issue->create, '', "class='btn btn-primary'");?> -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
issue->id;?>issue->type;?>issue->title;?>issue->severity;?>issue->pri;?>issue->owner;?>issue->desc;?>
id;?>issue->typeList, $issue->type);?>createLink('issue', 'view', "issueID=$issue->id"), $issue->title);?>issue->severityList, $issue->severity);?>issue->priList, $issue->pri);?>owner);?>desc;?>
- -
noData;?>
- -
-
- - From 8ed99bdf49a68ca51092bfd13bb3ab8fa8b0881a Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 14:50:36 +0800 Subject: [PATCH 213/347] - Delete the privilege of execution-browse. --- config/zentaopms.php | 1 + module/group/lang/resource.php | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index 78e4fe7fce..53a0082f76 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -229,6 +229,7 @@ $config->openMethods[] = 'task.editteam'; $config->openMethods[] = 'feedback.mergeproductmodule'; $config->openMethods[] = 'zanode.nodelist'; $config->openMethods[] = 'action.restoreStages'; +$config->openMethods[] = 'execution.browse'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 98d5fd7514..6e25839533 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -796,7 +796,6 @@ $lang->kanban->methodorder[225] = 'activateSpace'; /* Execution. */ $lang->resource->execution = new stdclass(); $lang->resource->execution->view = 'view'; -$lang->resource->execution->browse = 'browse'; $lang->resource->execution->create = 'createExec'; $lang->resource->execution->edit = 'editAction'; $lang->resource->execution->batchedit = 'batchEditAction'; @@ -855,7 +854,6 @@ $lang->resource->execution->kanban = 'RDKanban'; $lang->resource->execution->setKanban = 'setKanban'; $lang->execution->methodOrder[5] = 'view'; -$lang->execution->methodOrder[10] = 'browse'; $lang->execution->methodOrder[15] = 'create'; $lang->execution->methodOrder[20] = 'edit'; $lang->execution->methodOrder[25] = 'batchedit'; From b1d8c456a4132cee49bbc728df069ad7cdf56c2d Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 14:56:02 +0800 Subject: [PATCH 214/347] - Delete the privilege of execution-burnData. --- module/execution/lang/de.php | 1 - module/execution/lang/en.php | 1 - module/execution/lang/fr.php | 1 - module/execution/lang/zh-cn.php | 1 - module/group/lang/resource.php | 2 -- 5 files changed, 6 deletions(-) diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 166462e62e..b6a4367a6d 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -228,7 +228,6 @@ $lang->execution->testtask = 'Testaufgaben'; $lang->execution->burn = 'Burndown'; $lang->execution->computeBurn = 'Aktualisieren'; $lang->execution->computeCFD = 'Compute Cumulative Flow diagrams'; -$lang->execution->burnData = 'Burndown Daten'; $lang->execution->fixFirst = 'Bearbeite Mannstunden des ersten Tags'; $lang->execution->team = 'Teammitglieder'; $lang->execution->doc = 'Dok'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index e83738260f..7e7b2e904b 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -228,7 +228,6 @@ $lang->execution->testtask = 'Request'; $lang->execution->burn = 'Burndown'; $lang->execution->computeBurn = 'Update'; $lang->execution->computeCFD = 'Compute Cumulative Flow diagrams'; -$lang->execution->burnData = 'Burndown Data'; $lang->execution->fixFirst = 'Edit 1st-Day Estimates'; $lang->execution->team = 'Members'; $lang->execution->doc = 'Document'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 182e5766da..8c13412a1c 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -228,7 +228,6 @@ $lang->execution->testtask = 'Request'; $lang->execution->burn = 'Burndown'; $lang->execution->computeBurn = 'Update'; $lang->execution->computeCFD = 'Compute Cumulative Flow diagrams'; -$lang->execution->burnData = 'Burndown Data'; $lang->execution->fixFirst = 'Edit 1st-Day Estimates'; $lang->execution->team = 'Members'; $lang->execution->doc = 'Document'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 6103d29c0c..a22f4b4b70 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -228,7 +228,6 @@ $lang->execution->testtask = '测试单'; $lang->execution->burn = '燃尽图'; $lang->execution->computeBurn = '更新燃尽图'; $lang->execution->computeCFD = '更新累积流图'; -$lang->execution->burnData = '燃尽图数据'; $lang->execution->fixFirst = '修改首天工时'; $lang->execution->team = '团队成员'; $lang->execution->doc = '文档列表'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 6e25839533..5556c4d03d 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -823,7 +823,6 @@ $lang->resource->execution->computeBurn = 'computeBurnAction'; $lang->resource->execution->cfd = 'CFD'; $lang->resource->execution->computeCFD = 'computeCFD'; $lang->resource->execution->fixFirst = 'fixFirst'; -$lang->resource->execution->burnData = 'burnData'; $lang->resource->execution->team = 'teamAction'; $lang->resource->execution->doc = 'doc'; $lang->resource->execution->dynamic = 'dynamic'; @@ -881,7 +880,6 @@ $lang->execution->methodOrder[130] = 'computeBurn'; $lang->execution->methodOrder[132] = 'cfd'; $lang->execution->methodOrder[133] = 'computeCFD'; $lang->execution->methodOrder[135] = 'fixFirst'; -$lang->execution->methodOrder[140] = 'burnData'; $lang->execution->methodOrder[145] = 'team'; //$lang->execution->methodOrder[130] = 'doc'; $lang->execution->methodOrder[150] = 'dynamic'; From 2bc5edd717cba7d66151ec3a0a1d9bc5ece695b2 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 14:58:45 +0800 Subject: [PATCH 215/347] *- Delete the privilege of kanban-sortSpace. --- module/group/lang/resource.php | 2 -- module/kanban/lang/de.php | 1 - module/kanban/lang/en.php | 1 - module/kanban/lang/fr.php | 1 - module/kanban/lang/zh-cn.php | 1 - 5 files changed, 6 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 5556c4d03d..a1251686ae 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -704,7 +704,6 @@ $lang->resource->kanban->editSpace = 'editSpace'; $lang->resource->kanban->closeSpace = 'closeSpace'; $lang->resource->kanban->deleteSpace = 'deleteSpace'; $lang->resource->kanban->activateSpace = 'activateSpace'; -$lang->resource->kanban->sortSpace = 'sortSpace'; $lang->resource->kanban->create = 'create'; $lang->resource->kanban->edit = 'edit'; $lang->resource->kanban->setting = 'setting'; @@ -751,7 +750,6 @@ $lang->kanban->methodOrder[10] = 'createSpace'; $lang->kanban->methodOrder[15] = 'editSpace'; $lang->kanban->methodOrder[20] = 'closeSpace'; $lang->kanban->methodOrder[25] = 'deleteSpace'; -$lang->kanban->methodOrder[30] = 'sortSpace'; $lang->kanban->methodOrder[35] = 'create'; $lang->kanban->methodOrder[40] = 'edit'; $lang->kanban->methodOrder[45] = 'view'; diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php index 67a92e700d..773954a876 100644 --- a/module/kanban/lang/de.php +++ b/module/kanban/lang/de.php @@ -7,7 +7,6 @@ $lang->kanban->editSpace = 'Edit Space'; $lang->kanban->closeSpace = 'Close Space'; $lang->kanban->deleteSpace = 'Delete Space'; $lang->kanban->activateSpace = 'Activate Space'; -$lang->kanban->sortSpace = 'Sort Space'; $lang->kanban->edit = 'Edit Kanban'; $lang->kanban->view = 'View Kanban'; $lang->kanban->activate = 'Activate Kanban'; diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index c3163bf29f..2841e357b5 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -7,7 +7,6 @@ $lang->kanban->editSpace = 'Edit Space'; $lang->kanban->closeSpace = 'Close Space'; $lang->kanban->deleteSpace = 'Delete Space'; $lang->kanban->activateSpace = 'Activate Space'; -$lang->kanban->sortSpace = 'Sort Space'; $lang->kanban->edit = 'Edit Kanban'; $lang->kanban->view = 'View Kanban'; $lang->kanban->activate = 'Activate Kanban'; diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php index dc18c7f5bb..68877a9b15 100644 --- a/module/kanban/lang/fr.php +++ b/module/kanban/lang/fr.php @@ -7,7 +7,6 @@ $lang->kanban->editSpace = 'Edit Space'; $lang->kanban->closeSpace = 'Close Space'; $lang->kanban->deleteSpace = 'Delete Space'; $lang->kanban->activateSpace = 'Activate Space'; -$lang->kanban->sortSpace = 'Sort Space'; $lang->kanban->edit = 'Edit Kanban'; $lang->kanban->view = 'View Kanban'; $lang->kanban->activate = 'Activate Kanban'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index ee10648b55..92903ef587 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -7,7 +7,6 @@ $lang->kanban->editSpace = '设置空间'; $lang->kanban->closeSpace = '关闭空间'; $lang->kanban->deleteSpace = '删除空间'; $lang->kanban->activateSpace = '激活空间'; -$lang->kanban->sortSpace = '空间排序'; $lang->kanban->edit = '编辑看板'; $lang->kanban->view = '查看看板'; $lang->kanban->activate = '激活看板'; From ccdb3b23da4110d058697a1aab3a70472f0fcb7d Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 14:59:51 +0800 Subject: [PATCH 216/347] - Delete the privilege of stakeholder-expectation. --- db/zentao.sql | 15 --------------- module/group/lang/resource.php | 2 -- module/project/config.php | 2 +- module/stakeholder/lang/de.php | 1 - module/stakeholder/lang/en.php | 1 - module/stakeholder/lang/fr.php | 1 - module/stakeholder/lang/zh-cn.php | 1 - 7 files changed, 1 insertion(+), 22 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index b64c76b433..23cd0212c6 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2584,13 +2584,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'stakeholder','edit'), (1,'stakeholder','editExpect'), (1,'stakeholder','expect'), -(1,'stakeholder','expectation'), (1,'stakeholder','issue'), (1,'stakeholder','plan'), (1,'stakeholder','userIssue'), (1,'stakeholder','view'), (1,'stakeholder','viewExpect'), -(1,'stakeholder','viewIssue'), (1,'story','activate'), (1,'story','assignTo'), (1,'story','batchAssignTo'), @@ -3785,13 +3783,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'stakeholder','edit'), (4,'stakeholder','editExpect'), (4,'stakeholder','expect'), -(4,'stakeholder','expectation'), (4,'stakeholder','issue'), (4,'stakeholder','plan'), (4,'stakeholder','userIssue'), (4,'stakeholder','view'), (4,'stakeholder','viewExpect'), -(4,'stakeholder','viewIssue'), (4,'story','activate'), (4,'story','assignTo'), (4,'story','batchAssignTo'), @@ -4309,13 +4305,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'stakeholder','edit'), (5,'stakeholder','editExpect'), (5,'stakeholder','expect'), -(5,'stakeholder','expectation'), (5,'stakeholder','issue'), (5,'stakeholder','plan'), (5,'stakeholder','userIssue'), (5,'stakeholder','view'), (5,'stakeholder','viewExpect'), -(5,'stakeholder','viewIssue'), (5,'story','activate'), (5,'story','assignTo'), (5,'story','batchAssignTo'), @@ -4727,12 +4721,10 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'stakeholder','deleteExpect'), (6,'stakeholder','editExpect'), (6,'stakeholder','expect'), -(6,'stakeholder','expectation'), (6,'stakeholder','issue'), (6,'stakeholder','userIssue'), (6,'stakeholder','view'), (6,'stakeholder','viewExpect'), -(6,'stakeholder','viewIssue'), (6,'story','batchToTask'), (6,'story','bugs'), (6,'story','cases'), @@ -5122,12 +5114,10 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'stakeholder','edit'), (7,'stakeholder','editExpect'), (7,'stakeholder','expect'), -(7,'stakeholder','expectation'), (7,'stakeholder','issue'), (7,'stakeholder','userIssue'), (7,'stakeholder','view'), (7,'stakeholder','viewExpect'), -(7,'stakeholder','viewIssue'), (7,'story','activate'), (7,'story','assignTo'), (7,'story','batchAssignTo'), @@ -5903,13 +5893,11 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'stakeholder','edit'), (9,'stakeholder','editExpect'), (9,'stakeholder','expect'), -(9,'stakeholder','expectation'), (9,'stakeholder','issue'), (9,'stakeholder','plan'), (9,'stakeholder','userIssue'), (9,'stakeholder','view'), (9,'stakeholder','viewExpect'), -(9,'stakeholder','viewIssue'), (9,'story','bugs'), (9,'story','cases'), (9,'story','export'), @@ -6170,7 +6158,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10,'stakeholder','browse'), (10,'stakeholder','userIssue'), (10,'stakeholder','view'), -(10,'stakeholder','viewIssue'), (10,'story','bugs'), (10,'story','cases'), (10,'story','export'), @@ -6424,12 +6411,10 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'stakeholder','browse'), (11,'stakeholder','communicate'), (11,'stakeholder','expect'), -(11,'stakeholder','expectation'), (11,'stakeholder','issue'), (11,'stakeholder','userIssue'), (11,'stakeholder','view'), (11,'stakeholder','viewExpect'), -(11,'stakeholder','viewIssue'), (11,'story','bugs'), (11,'story','cases'), (11,'story','export'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index c2ebab27d7..bc92d65872 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -334,7 +334,6 @@ $lang->resource->stakeholder->view = 'viewAction'; $lang->resource->stakeholder->issue = 'issue'; $lang->resource->stakeholder->communicate = 'communicate'; $lang->resource->stakeholder->expect = 'expect'; -$lang->resource->stakeholder->expectation = 'expectation'; $lang->resource->stakeholder->deleteExpect = 'deleteExpect'; $lang->resource->stakeholder->createExpect = 'createExpect'; $lang->resource->stakeholder->editExpect = 'editExpect'; @@ -350,7 +349,6 @@ $lang->stakeholder->methodOrder[30] = 'view'; $lang->stakeholder->methodOrder[35] = 'issue'; $lang->stakeholder->methodOrder[45] = 'communicate'; $lang->stakeholder->methodOrder[50] = 'expect'; -$lang->stakeholder->methodOrder[55] = 'expectation'; $lang->stakeholder->methodOrder[60] = 'deleteExpect'; $lang->stakeholder->methodOrder[65] = 'createExpect'; $lang->stakeholder->methodOrder[70] = 'editExpect'; diff --git a/module/project/config.php b/module/project/config.php index 475dbe4d52..7712dba71c 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -214,4 +214,4 @@ $config->project->includedPriv['repo'] = array('create', 'showSyncCommit', $config->project->includedPriv['testreport'] = array('create', 'view', 'delete', 'edit', 'export'); $config->project->includedPriv['auditplan'] = array('browse', 'create', 'edit', 'batchCreate', 'batchCheck', 'check', 'nc', 'result', 'assignTo'); $config->project->includedPriv['execution'] = array('create', 'start', 'delete', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt'); -if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'expectation', 'deleteExpect', 'createExpect', 'editExpect', 'viewExpect'); +if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'deleteExpect', 'createExpect', 'editExpect', 'viewExpect'); diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php index f6bf36bfc4..83f9b5dd64 100644 --- a/module/stakeholder/lang/de.php +++ b/module/stakeholder/lang/de.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->expectation = 'Manage Expectation'; $lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php index 348886985f..82dae78ea0 100644 --- a/module/stakeholder/lang/en.php +++ b/module/stakeholder/lang/en.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->expectation = 'Manage Expectation'; $lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php index f6bf36bfc4..83f9b5dd64 100644 --- a/module/stakeholder/lang/fr.php +++ b/module/stakeholder/lang/fr.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->expectation = 'Manage Expectation'; $lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index b474241cd5..20a71f8f3d 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = '新建'; $lang->stakeholder->communicate = '沟通记录'; $lang->stakeholder->expect = '期望内容'; $lang->stakeholder->progress = '达成进展'; -$lang->stakeholder->expectation = '期望管理'; $lang->stakeholder->createExpect = '添加期望'; $lang->stakeholder->deleteExpect = '删除期望'; $lang->stakeholder->editExpect = '编辑期望'; From b66763c9c501f6a9b5bfe8bf7cdbe48704c0f8f7 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 14:59:52 +0800 Subject: [PATCH 217/347] - Delete the privilege of product-build. --- db/zentao.sql | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index b64c76b433..6a52ccf369 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2416,7 +2416,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'product','all'), (1,'product','batchEdit'), (1,'product','browse'), -(1,'product','build'), (1,'product','close'), (1,'product','create'), (1,'product','dashboard'), @@ -2939,7 +2938,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'personnel','whitelist'), (2,'product','all'), (2,'product','browse'), -(2,'product','build'), (2,'product','dashboard'), (2,'product','dynamic'), (2,'product','index'), @@ -3242,7 +3240,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'personnel','whitelist'), (3,'product','all'), (3,'product','browse'), -(3,'product','build'), (3,'product','dashboard'), (3,'product','doc'), (3,'product','dynamic'), @@ -3628,7 +3625,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'product','all'), (4,'product','batchEdit'), (4,'product','browse'), -(4,'product','build'), (4,'product','close'), (4,'product','create'), (4,'product','dashboard'), @@ -4150,7 +4146,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'product','all'), (5,'product','batchEdit'), (5,'product','browse'), -(5,'product','build'), (5,'product','close'), (5,'product','create'), (5,'product','dashboard'), @@ -4610,7 +4605,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'personnel','whitelist'), (6,'product','all'), (6,'product','browse'), -(6,'product','build'), (6,'product','dashboard'), (6,'product','doc'), (6,'product','dynamic'), @@ -4982,7 +4976,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'product','all'), (7,'product','batchEdit'), (7,'product','browse'), -(7,'product','build'), (7,'product','close'), (7,'product','create'), (7,'product','dashboard'), @@ -5421,7 +5414,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'my','work'), (8,'product','all'), (8,'product','browse'), -(8,'product','build'), (8,'product','dashboard'), (8,'product','doc'), (8,'product','dynamic'), @@ -5796,7 +5788,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'personnel','whitelist'), (9,'product','all'), (9,'product','browse'), -(9,'product','build'), (9,'product','dashboard'), (9,'product','doc'), (9,'product','dynamic'), @@ -6110,7 +6101,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10,'personnel','whitelist'), (10,'product','all'), (10,'product','browse'), -(10,'product','build'), (10,'product','dashboard'), (10,'product','doc'), (10,'product','dynamic'), @@ -6356,7 +6346,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'personnel','whitelist'), (11,'product','all'), (11,'product','browse'), -(11,'product','build'), (11,'product','dashboard'), (11,'product','doc'), (11,'product','dynamic'), From d6bbc00d33c47d41ab126b147d75e56ef25e95be Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:01:24 +0800 Subject: [PATCH 218/347] - Delete the privilege of project-qa. --- db/zentao.sql | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 77a82d4fcf..e23852dce9 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2491,7 +2491,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'project','manageProducts'), (1,'project','manageView'), (1,'project','programTitle'), -(1,'project','qa'), (1,'project','start'), (1,'project','suspend'), (1,'project','team'), @@ -2962,7 +2961,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'project','kanban'), (2,'project','manageMembers'), (2,'project','programTitle'), -(2,'project','qa'), (2,'project','team'), (2,'project','testcase'), (2,'project','testreport'), @@ -3264,7 +3262,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'project','index'), (3,'project','kanban'), (3,'project','programTitle'), -(3,'project','qa'), (3,'project','team'), (3,'project','testcase'), (3,'project','testreport'), @@ -3694,7 +3691,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'project','manageProducts'), (4,'project','manageView'), (4,'project','programTitle'), -(4,'project','qa'), (4,'project','start'), (4,'project','suspend'), (4,'project','team'), @@ -4215,7 +4211,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'project','managePriv'), (5,'project','manageProducts'), (5,'project','programTitle'), -(5,'project','qa'), (5,'project','start'), (5,'project','suspend'), (5,'project','team'), @@ -4649,7 +4644,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'project','managePriv'), (6,'project','manageProducts'), (6,'project','programTitle'), -(6,'project','qa'), (6,'project','start'), (6,'project','suspend'), (6,'project','team'), @@ -5041,7 +5035,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'project','managePriv'), (7,'project','manageProducts'), (7,'project','programTitle'), -(7,'project','qa'), (7,'project','start'), (7,'project','suspend'), (7,'project','team'), @@ -5454,7 +5447,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'project','managePriv'), (8,'project','manageProducts'), (8,'project','programTitle'), -(8,'project','qa'), (8,'project','start'), (8,'project','suspend'), (8,'project','team'), @@ -5828,7 +5820,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'project','managePriv'), (9,'project','manageProducts'), (9,'project','programTitle'), -(9,'project','qa'), (9,'project','start'), (9,'project','suspend'), (9,'project','team'), @@ -6358,7 +6349,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'project','index'), (11,'project','kanban'), (11,'project','programTitle'), -(11,'project','qa'), (11,'project','team'), (11,'project','testcase'), (11,'project','testreport'), From 6e4b54cc8b8a233cc0951eed4dc39da052b7d45a Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:02:05 +0800 Subject: [PATCH 219/347] - Delete the privilege of execution-browse. --- db/zentao.sql | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index e23852dce9..8870b412be 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2274,7 +2274,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'execution','all'), (1,'execution','batchedit'), (1,'execution','batchUnlinkStory'), -(1,'execution','browse'), (1,'execution','bug'), (1,'execution','build'), (1,'execution','burn'), @@ -2865,7 +2864,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'doc','projectSpace'), (2,'doc','tableContents'), (2,'execution','all'), -(2,'execution','browse'), (2,'execution','bug'), (2,'execution','build'), (2,'execution','burn'), @@ -3170,7 +3168,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'doc','projectSpace'), (3,'doc','tableContents'), (3,'execution','all'), -(3,'execution','browse'), (3,'execution','bug'), (3,'execution','build'), (3,'execution','burn'), @@ -3517,7 +3514,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'execution','all'), (4,'execution','batchedit'), (4,'execution','batchUnlinkStory'), -(4,'execution','browse'), (4,'execution','bug'), (4,'execution','build'), (4,'execution','burn'), @@ -4034,7 +4030,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'execution','all'), (5,'execution','batchedit'), (5,'execution','batchUnlinkStory'), -(5,'execution','browse'), (5,'execution','bug'), (5,'execution','build'), (5,'execution','burn'), @@ -4504,7 +4499,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'execution','all'), (6,'execution','batchedit'), (6,'execution','batchUnlinkStory'), -(6,'execution','browse'), (6,'execution','bug'), (6,'execution','build'), (6,'execution','burn'), @@ -4892,7 +4886,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'doc','projectSpace'), (7,'doc','tableContents'), (7,'execution','all'), -(7,'execution','browse'), (7,'execution','bug'), (7,'execution','build'), (7,'execution','burn'), @@ -5313,7 +5306,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'doc','projectSpace'), (8,'doc','tableContents'), (8,'execution','all'), -(8,'execution','browse'), (8,'execution','bug'), (8,'execution','build'), (8,'execution','burn'), @@ -5697,7 +5689,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'doc','projectSpace'), (9,'doc','tableContents'), (9,'execution','all'), -(9,'execution','browse'), (9,'execution','bug'), (9,'execution','build'), (9,'execution','burn'), @@ -6024,7 +6015,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10,'doc','projectSpace'), (10,'doc','tableContents'), (10,'execution','all'), -(10,'execution','browse'), (10,'execution','bug'), (10,'execution','build'), (10,'execution','burn'), @@ -6266,7 +6256,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'doc','projectSpace'), (11,'doc','tableContents'), (11,'execution','all'), -(11,'execution','browse'), (11,'execution','bug'), (11,'execution','build'), (11,'execution','burn'), From c900a372ba56af59540c1f058b1e0641a0c818b2 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:02:44 +0800 Subject: [PATCH 220/347] - Delete the privilege of execution-burnData. --- db/zentao.sql | 7 ------- 1 file changed, 7 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 8870b412be..1a4b3efe12 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2277,7 +2277,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'execution','bug'), (1,'execution','build'), (1,'execution','burn'), -(1,'execution','burnData'), (1,'execution','close'), (1,'execution','computeBurn'), (1,'execution','create'), @@ -2867,7 +2866,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'execution','bug'), (2,'execution','build'), (2,'execution','burn'), -(2,'execution','burnData'), (2,'execution','computeBurn'), (2,'execution','doc'), (2,'execution','dynamic'), @@ -3517,7 +3515,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'execution','bug'), (4,'execution','build'), (4,'execution','burn'), -(4,'execution','burnData'), (4,'execution','close'), (4,'execution','computeBurn'), (4,'execution','create'), @@ -4033,7 +4030,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'execution','bug'), (5,'execution','build'), (5,'execution','burn'), -(5,'execution','burnData'), (5,'execution','close'), (5,'execution','computeBurn'), (5,'execution','create'), @@ -4502,7 +4498,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'execution','bug'), (6,'execution','build'), (6,'execution','burn'), -(6,'execution','burnData'), (6,'execution','close'), (6,'execution','computeBurn'), (6,'execution','create'), @@ -5309,7 +5304,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'execution','bug'), (8,'execution','build'), (8,'execution','burn'), -(8,'execution','burnData'), (8,'execution','computeBurn'), (8,'execution','doc'), (8,'execution','dynamic'), @@ -5692,7 +5686,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'execution','bug'), (9,'execution','build'), (9,'execution','burn'), -(9,'execution','burnData'), (9,'execution','computeBurn'), (9,'execution','doc'), (9,'execution','dynamic'), From ebf47c2dc13df0211322729a34e28cec4cdd98c7 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:15:06 +0800 Subject: [PATCH 221/347] - Delete the privilege of kanban-laneMove. --- module/execution/js/taskkanban.js | 4 ---- module/execution/view/taskkanban.html.php | 1 - module/group/lang/resource.php | 2 -- module/kanban/control.php | 24 -------------------- module/kanban/lang/de.php | 1 - module/kanban/lang/en.php | 1 - module/kanban/lang/fr.php | 1 - module/kanban/lang/zh-cn.php | 1 - module/kanban/model.php | 27 ----------------------- 9 files changed, 62 deletions(-) diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js index 487837e75a..144f326a2f 100644 --- a/module/execution/js/taskkanban.js +++ b/module/execution/js/taskkanban.js @@ -999,10 +999,6 @@ function createLaneMenu(options) var items = []; if(priv.canSetLane) items.push({label: kanbanLang.setLane, icon: 'edit', url: $.createLink('kanban', 'setLane', 'lane=' + lane.laneID + '&executionID=' + executionID + '&from=execution'), className: 'iframe'}); - if(priv.canMoveLane) items.push( - {label: kanbanLang.moveUp, icon: 'arrow-up', url: $.createLink('kanban', 'laneMove', 'executionID=' + executionID + '¤tLane=' + lane.id + '&targetLane=' + upTargetKanban), className: 'iframe', disabled: !$kanban.prev('.kanban').length}, - {label: kanbanLang.moveDown, icon: 'arrow-down', url: $.createLink('kanban', 'laneMove', 'executionID=' + executionID + '¤tLane=' + lane.id + '&targetLane=' + downTargetKanban), className: 'iframe', disabled: !$kanban.next('.kanban').length} - ); var bounds = options.$trigger[0].getBoundingClientRect(); items.$options = {x: bounds.right, y: bounds.top}; diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php index 764e74419a..1587fff5bb 100644 --- a/module/execution/view/taskkanban.html.php +++ b/module/execution/view/taskkanban.html.php @@ -189,7 +189,6 @@ js::set('priv', 'canEditName' => common::hasPriv('kanban', 'setColumn'), 'canSetWIP' => common::hasPriv('kanban', 'setWIP'), 'canSetLane' => common::hasPriv('kanban', 'setLane'), - 'canMoveLane' => common::hasPriv('kanban', 'laneMove'), 'canSortCards' => common::hasPriv('kanban', 'cardsSort'), 'canCreateTask' => $canCreateTask, 'canBatchCreateTask' => $canBatchCreateTask, diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 0b235030ec..a25b9c19ad 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -737,7 +737,6 @@ $lang->resource->kanban->assigntoCard = 'assigntoCard'; $lang->resource->kanban->deleteCard = 'deleteCard'; $lang->resource->kanban->moveCard = 'moveCard'; $lang->resource->kanban->setCardColor = 'setCardColor'; -$lang->resource->kanban->laneMove = 'laneMove'; $lang->resource->kanban->viewArchivedColumn = 'viewArchivedColumn'; $lang->resource->kanban->viewArchivedCard = 'viewArchivedCard'; $lang->resource->kanban->restoreCard = 'restoreCard'; @@ -779,7 +778,6 @@ $lang->kanban->methodOrder[165] = 'deleteCard'; $lang->kanban->methodOrder[170] = 'assigntoCard'; $lang->kanban->methodOrder[175] = 'moveCard'; $lang->kanban->methodOrder[180] = 'setCardColor'; -$lang->kanban->methodOrder[185] = 'laneMove'; $lang->kanban->methodorder[190] = 'cardsSort'; $lang->kanban->methodOrder[195] = 'viewArchivedColumn'; $lang->kanban->methodorder[200] = 'viewArchivedCard'; diff --git a/module/kanban/control.php b/module/kanban/control.php index 2db3be55cf..0959f660c8 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -1923,30 +1923,6 @@ class kanban extends control echo json_encode($kanbanGroup); } - /** - * Change the order through the lane move up and down. - * - * @param int $executionID - * @param string $currentType - * @param string $targetType - * @access public - * @return void - */ - public function laneMove($executionID, $currentType, $targetType) - { - if(empty($targetType)) return false; - - $this->kanban->updateLaneOrder($executionID, $currentType, $targetType); - - if(!dao::isError()) - { - $laneID = $this->dao->select('id')->from(TABLE_KANBANLANE)->where('execution')->eq($executionID)->andWhere('type')->eq($currentType)->fetch('id'); - $this->loadModel('action')->create('kanbanlane', $laneID, 'Moved'); - } - - echo js::locate($this->createLink('execution', 'kanban', 'executionID=' . $executionID . '&type=all'), 'parent'); - } - /** * Ajax get contact users. * diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php index 773954a876..dacbd7059d 100644 --- a/module/kanban/lang/de.php +++ b/module/kanban/lang/de.php @@ -196,7 +196,6 @@ $lang->kanban->columnName = 'Column Name'; $lang->kanban->columnColor = 'Column Color'; $lang->kanban->moveUp = 'Swimlane Up'; $lang->kanban->moveDown = 'Swimlane Down'; -$lang->kanban->laneMove = 'Swimlane Move'; $lang->kanban->laneGroup = 'Lane Group'; $lang->kanban->cardsSort = 'Cards Sortting'; $lang->kanban->more = 'More'; diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 2841e357b5..56406a02c2 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -196,7 +196,6 @@ $lang->kanban->columnName = 'Column Name'; $lang->kanban->columnColor = 'Column Color'; $lang->kanban->moveUp = 'Swimlane Up'; $lang->kanban->moveDown = 'Swimlane Down'; -$lang->kanban->laneMove = 'Swimlane Move'; $lang->kanban->laneGroup = 'Lane Group'; $lang->kanban->cardsSort = 'Cards Sortting'; $lang->kanban->more = 'More'; diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php index 68877a9b15..f1f51a27aa 100644 --- a/module/kanban/lang/fr.php +++ b/module/kanban/lang/fr.php @@ -196,7 +196,6 @@ $lang->kanban->columnName = 'Column Name'; $lang->kanban->columnColor = 'Column Color'; $lang->kanban->moveUp = 'Swimlane Up'; $lang->kanban->moveDown = 'Swimlane Down'; -$lang->kanban->laneMove = 'Swimlane Move'; $lang->kanban->laneGroup = 'Lane Group'; $lang->kanban->cardsSort = 'Cards Sortting'; $lang->kanban->more = 'More'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 92903ef587..4a9c971b57 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -196,7 +196,6 @@ $lang->kanban->columnName = '看板列名称'; $lang->kanban->columnColor = '看板列颜色'; $lang->kanban->moveUp = '泳道上移'; $lang->kanban->moveDown = '泳道下移'; -$lang->kanban->laneMove = '泳道移动'; $lang->kanban->laneGroup = '泳道分组'; $lang->kanban->cardsSort = '卡片排序'; $lang->kanban->more = '更多'; diff --git a/module/kanban/model.php b/module/kanban/model.php index fd8051f012..173956ff1b 100755 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -3050,33 +3050,6 @@ class kanbanModel extends model return $changes; } - /** - * Change the order through the lane move up and down. - * - * @param int $executionID - * @param string $currentType - * @param string $targetType - * @access public - * @return void - */ - public function updateLaneOrder($executionID, $currentType, $targetType) - { - $orderList = $this->dao->select('id,type,`order`')->from(TABLE_KANBANLANE) - ->where('execution')->eq($executionID) - ->andWhere('type')->in(array($currentType, $targetType)) - ->andWhere('groupby')->eq('') - ->fetchAll('type'); - - $this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$targetType]->order) - ->where('id')->eq($orderList[$currentType]->id) - ->andWhere('groupby')->eq('') - ->exec(); - - $this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$currentType]->order) - ->where('id')->eq($orderList[$targetType]->id) - ->andWhere('groupby')->eq('') - ->exec(); - } /** * Activate a card. * From 6e770918f22de4b75807a36a0c81c5e34ba3f340 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:17:26 +0800 Subject: [PATCH 222/347] - Delete the privilege of testcase-showImport. --- config/zentaopms.php | 1 + module/group/lang/resource.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index 53a0082f76..4249de8326 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -230,6 +230,7 @@ $config->openMethods[] = 'feedback.mergeproductmodule'; $config->openMethods[] = 'zanode.nodelist'; $config->openMethods[] = 'action.restoreStages'; $config->openMethods[] = 'execution.browse'; +$config->openMethods[] = 'testcase.showImport'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index a25b9c19ad..2d723d3399 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1055,7 +1055,6 @@ $lang->resource->testcase->batchDelete = 'batchDelete'; $lang->resource->testcase->export = 'exportAction'; $lang->resource->testcase->exportTemplate = 'exportTemplate'; $lang->resource->testcase->import = 'importAction'; -$lang->resource->testcase->showImport = 'showImport'; $lang->resource->testcase->confirmChange = 'confirmChange'; $lang->resource->testcase->confirmStoryChange = 'confirmStoryChange'; $lang->resource->testcase->batchChangeModule = 'batchChangeModule'; From 452aa7cad3950da9fca3137017928cf132df9d39 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:19:39 +0800 Subject: [PATCH 223/347] - Delete the privilege of testsuite-index. --- config/zentaopms.php | 1 + module/group/lang/resource.php | 2 -- module/testsuite/lang/de.php | 1 - module/testsuite/lang/en.php | 1 - module/testsuite/lang/fr.php | 1 - module/testsuite/lang/zh-cn.php | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index 4249de8326..5bb66fa40b 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -231,6 +231,7 @@ $config->openMethods[] = 'zanode.nodelist'; $config->openMethods[] = 'action.restoreStages'; $config->openMethods[] = 'execution.browse'; $config->openMethods[] = 'testcase.showImport'; +$config->openMethods[] = 'testsuite.index'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 2d723d3399..3e382ddad2 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1164,7 +1164,6 @@ $lang->testreport->methodOrder[15] = 'delete'; $lang->testreport->methodOrder[20] = 'edit'; $lang->resource->testsuite = new stdclass(); -$lang->resource->testsuite->index = 'index'; $lang->resource->testsuite->browse = 'browse'; $lang->resource->testsuite->create = 'create'; $lang->resource->testsuite->view = 'view'; @@ -1174,7 +1173,6 @@ $lang->resource->testsuite->linkCase = 'linkCase'; $lang->resource->testsuite->unlinkCase = 'unlinkCaseAction'; $lang->resource->testsuite->batchUnlinkCases = 'batchUnlinkCases'; -$lang->testsuite->methodOrder[0] = 'index'; $lang->testsuite->methodOrder[5] = 'browse'; $lang->testsuite->methodOrder[10] = 'create'; $lang->testsuite->methodOrder[15] = 'view'; diff --git a/module/testsuite/lang/de.php b/module/testsuite/lang/de.php index c69d62e0b7..1bdb72be1a 100644 --- a/module/testsuite/lang/de.php +++ b/module/testsuite/lang/de.php @@ -9,7 +9,6 @@ * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ * @link http://www.zentao.net */ -$lang->testsuite->index = "Home"; $lang->testsuite->create = "Erstellen"; $lang->testsuite->delete = "Löschen"; $lang->testsuite->view = "Übersicht"; diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php index 1098f29fa7..077dd5a697 100644 --- a/module/testsuite/lang/en.php +++ b/module/testsuite/lang/en.php @@ -9,7 +9,6 @@ * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ * @link http://www.zentao.net */ -$lang->testsuite->index = "Suite Home"; $lang->testsuite->create = "Create Suite"; $lang->testsuite->delete = "Delete Suite"; $lang->testsuite->view = "Suite Detail"; diff --git a/module/testsuite/lang/fr.php b/module/testsuite/lang/fr.php index c7916c96b1..59bdbc5d00 100644 --- a/module/testsuite/lang/fr.php +++ b/module/testsuite/lang/fr.php @@ -9,7 +9,6 @@ * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ * @link http://www.zentao.net */ -$lang->testsuite->index = "Accueil Cahier Recette"; $lang->testsuite->create = "Créer un Cahier"; $lang->testsuite->delete = "Supprimer un Cahier"; $lang->testsuite->view = "Détail du Cahier"; diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php index d17880dcd8..1315d01298 100644 --- a/module/testsuite/lang/zh-cn.php +++ b/module/testsuite/lang/zh-cn.php @@ -9,7 +9,6 @@ * @version $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ * @link http://www.zentao.net */ -$lang->testsuite->index = "套件首页"; $lang->testsuite->create = "建套件"; $lang->testsuite->delete = "删除"; $lang->testsuite->view = "概况"; From e71c6b1548d4bdee003fdeb5cb889e9a84219248 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:22:21 +0800 Subject: [PATCH 224/347] - Delete the privilege of caselib-index. --- config/zentaopms.php | 1 + module/caselib/lang/de.php | 1 - module/caselib/lang/en.php | 1 - module/caselib/lang/fr.php | 1 - module/caselib/lang/zh-cn.php | 1 - module/group/lang/resource.php | 2 -- 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index 5bb66fa40b..66c01da673 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -232,6 +232,7 @@ $config->openMethods[] = 'action.restoreStages'; $config->openMethods[] = 'execution.browse'; $config->openMethods[] = 'testcase.showImport'; $config->openMethods[] = 'testsuite.index'; +$config->openMethods[] = 'caselib.index'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/module/caselib/lang/de.php b/module/caselib/lang/de.php index 45bb091ed4..53266fc3ae 100644 --- a/module/caselib/lang/de.php +++ b/module/caselib/lang/de.php @@ -12,7 +12,6 @@ $lang->caselib->common = 'Case Library'; $lang->caselib->all = 'All Case Libraries'; -$lang->caselib->index = "Library Home"; $lang->caselib->create = "Create Case Library"; $lang->caselib->edit = 'Edit Case Library'; $lang->caselib->browse = 'View Cases in Library'; diff --git a/module/caselib/lang/en.php b/module/caselib/lang/en.php index 45bb091ed4..53266fc3ae 100644 --- a/module/caselib/lang/en.php +++ b/module/caselib/lang/en.php @@ -12,7 +12,6 @@ $lang->caselib->common = 'Case Library'; $lang->caselib->all = 'All Case Libraries'; -$lang->caselib->index = "Library Home"; $lang->caselib->create = "Create Case Library"; $lang->caselib->edit = 'Edit Case Library'; $lang->caselib->browse = 'View Cases in Library'; diff --git a/module/caselib/lang/fr.php b/module/caselib/lang/fr.php index 4026ca62c8..342dbfabb5 100644 --- a/module/caselib/lang/fr.php +++ b/module/caselib/lang/fr.php @@ -12,7 +12,6 @@ $lang->caselib->common = 'Case Library'; $lang->caselib->all = 'All Case Libraries'; -$lang->caselib->index = "Accueil Library"; $lang->caselib->create = "Créer une Library"; $lang->caselib->edit = 'Editer Library'; $lang->caselib->browse = 'Voir CasTests dans Library'; diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php index 0cb58ca9c1..61a4dbbbe1 100644 --- a/module/caselib/lang/zh-cn.php +++ b/module/caselib/lang/zh-cn.php @@ -12,7 +12,6 @@ $lang->caselib->common = '用例库'; $lang->caselib->all = '所有用例库'; -$lang->caselib->index = "用例库首页"; $lang->caselib->create = "创建用例库"; $lang->caselib->edit = '编辑用例库'; $lang->caselib->browse = '浏览用例库'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 3e382ddad2..0cf86e3b50 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1183,7 +1183,6 @@ $lang->testsuite->methodOrder[35] = 'unlinkCase'; $lang->testsuite->methodOrder[40] = 'batchUnlinkCases'; $lang->resource->caselib = new stdclass(); -$lang->resource->caselib->index = 'index'; $lang->resource->caselib->browse = 'browseAction'; $lang->resource->caselib->create = 'create'; $lang->resource->caselib->edit = 'edit'; @@ -1195,7 +1194,6 @@ $lang->resource->caselib->exportTemplate = 'exportTemplate'; $lang->resource->caselib->import = 'importAction'; $lang->resource->caselib->showImport = 'showImport'; -$lang->caselib->methodOrder[0] = 'index'; $lang->caselib->methodOrder[5] = 'browse'; $lang->caselib->methodOrder[10] = 'create'; $lang->caselib->methodOrder[15] = 'edit'; From f5f9dd32e751c9a186a393d35cd015c7b5f5db82 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:25:30 +0800 Subject: [PATCH 225/347] - Delete the privilege of company-index. --- config/zentaopms.php | 1 + module/group/lang/resource.php | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index 66c01da673..d5dda04ad0 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -233,6 +233,7 @@ $config->openMethods[] = 'execution.browse'; $config->openMethods[] = 'testcase.showImport'; $config->openMethods[] = 'testsuite.index'; $config->openMethods[] = 'caselib.index'; +$config->openMethods[] = 'company.index'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 0cf86e3b50..759049ec83 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1647,13 +1647,11 @@ $lang->git->methodOrder[15] = 'apiSync'; /* Company. */ $lang->resource->company = new stdclass(); -$lang->resource->company->index = 'index'; $lang->resource->company->browse = 'browse'; $lang->resource->company->edit = 'edit'; $lang->resource->company->view = 'view'; $lang->resource->company->dynamic= 'dynamic'; -$lang->company->methodOrder[0] = 'index'; $lang->company->methodOrder[5] = 'browse'; $lang->company->methodOrder[15] = 'edit'; $lang->company->methodOrder[25] = 'dynamic'; From 89f66325408ed645673865fabd8ec187d4c84e6c Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:26:44 +0800 Subject: [PATCH 226/347] - Delete the privilege of user-cropAvatar. --- config/zentaopms.php | 1 + module/group/lang/resource.php | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index d5dda04ad0..0f5bde1250 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -234,6 +234,7 @@ $config->openMethods[] = 'testcase.showImport'; $config->openMethods[] = 'testsuite.index'; $config->openMethods[] = 'caselib.index'; $config->openMethods[] = 'company.index'; +$config->openMethods[] = 'user.cropAvatar'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 759049ec83..fcc899aaf1 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1733,7 +1733,6 @@ $lang->resource->user->testTask = 'testTask'; $lang->resource->user->testCase = 'testCase'; $lang->resource->user->execution = 'execution'; $lang->resource->user->dynamic = 'dynamic'; -$lang->resource->user->cropAvatar = 'cropAvatar'; $lang->resource->user->profile = 'profile'; $lang->resource->user->batchEdit = 'batchEdit'; $lang->resource->user->unbind = 'unbind'; @@ -1750,7 +1749,6 @@ $lang->user->methodOrder[35] = 'task'; $lang->user->methodOrder[40] = 'bug'; $lang->user->methodOrder[45] = 'project'; $lang->user->methodOrder[60] = 'dynamic'; -$lang->user->methodOrder[65] = 'cropAvatar'; $lang->user->methodOrder[70] = 'profile'; $lang->user->methodOrder[75] = 'batchEdit'; $lang->user->methodOrder[80] = 'unbind'; From 485ed73e6a682f80cbba27fce9f9f5b4c16bdc3c Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:35:06 +0800 Subject: [PATCH 227/347] - Delete the privilege of admin-sso. --- module/admin/control.php | 37 ----------------------- module/admin/lang/de.php | 2 -- module/admin/lang/en.php | 2 -- module/admin/lang/fr.php | 2 -- module/admin/lang/zh-cn.php | 2 -- module/admin/view/sso.html.php | 54 ---------------------------------- module/group/lang/resource.php | 2 -- 7 files changed, 101 deletions(-) delete mode 100755 module/admin/view/sso.html.php diff --git a/module/admin/control.php b/module/admin/control.php index 8c997f4a7b..30ccbb0340 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -256,43 +256,6 @@ class admin extends control $this->display(); } - /** - * Config sso for ranzhi. - * - * @access public - * @return void - */ - public function sso() - { - if(!empty($_POST)) - { - $ssoConfig = new stdclass(); - $ssoConfig->turnon = $this->post->turnon; - $ssoConfig->redirect = $this->post->redirect; - $ssoConfig->addr = $this->post->addr; - $ssoConfig->code = trim($this->post->code); - $ssoConfig->key = trim($this->post->key); - - if(!$ssoConfig->turnon) $ssoConfig->redirect = $ssoConfig->turnon; - $this->loadModel('setting')->setItems('system.sso', $ssoConfig); - if(dao::isError()) return print(js::error(dao::getError())); - return print($this->locate(inlink('sso'))); - } - - $this->loadModel('sso'); - if(!isset($this->config->sso)) $this->config->sso = new stdclass(); - - $this->view->title = $this->lang->admin->sso; - $this->view->position[] = $this->lang->admin->sso; - - $this->view->turnon = isset($this->config->sso->turnon) ? $this->config->sso->turnon : 1; - $this->view->redirect = isset($this->config->sso->redirect) ? $this->config->sso->redirect : 0; - $this->view->addr = isset($this->config->sso->addr) ? $this->config->sso->addr : ''; - $this->view->key = isset($this->config->sso->key) ? $this->config->sso->key : ''; - $this->view->code = isset($this->config->sso->code) ? $this->config->sso->code : ''; - $this->display(); - } - /** * Set closed features config. * diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index ac0302561d..460253037a 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -11,8 +11,6 @@ */ $lang->admin->index = 'Admin Home'; $lang->admin->checkDB = 'Datenbank prüfen'; -$lang->admin->sso = 'SSO'; -$lang->admin->ssoAction = 'Link Zdoo'; $lang->admin->safeIndex = 'Sicherheit'; $lang->admin->checkWeak = 'Schwache Passwörter prüfen'; $lang->admin->certifyMobile = 'Prüfen Sie die Mobilnummer'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 9094d6a330..2122516210 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -11,8 +11,6 @@ */ $lang->admin->index = 'Admin Home'; $lang->admin->checkDB = 'Check Database'; -$lang->admin->sso = 'Zdoo'; -$lang->admin->ssoAction = 'Link Zdoo'; $lang->admin->safeIndex = 'Security'; $lang->admin->checkWeak = 'Check Weak Password'; $lang->admin->certifyMobile = 'Verify your cellphone'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 99ae83495c..c4734a07c7 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -11,8 +11,6 @@ */ $lang->admin->index = 'Admin Home'; $lang->admin->checkDB = 'Check Database'; -$lang->admin->sso = 'Zdoo'; -$lang->admin->ssoAction = 'Link Zdoo'; $lang->admin->safeIndex = 'Sécurité'; $lang->admin->checkWeak = 'Contrôle niveau de sécurité des mots de passe'; $lang->admin->certifyMobile = 'Vérifier votre smartphone'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 2e8af2b073..138170253a 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -11,8 +11,6 @@ */ $lang->admin->index = '后台管理首页'; $lang->admin->checkDB = '检查数据库'; -$lang->admin->sso = 'ZDOO集成'; -$lang->admin->ssoAction = 'ZDOO集成'; $lang->admin->safeIndex = '安全'; $lang->admin->checkWeak = '弱口令检查'; $lang->admin->certifyMobile = '认证手机'; diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php deleted file mode 100755 index 2bc03ea14b..0000000000 --- a/module/admin/view/sso.html.php +++ /dev/null @@ -1,54 +0,0 @@ - - * @package admin - * @version $Id$ - * @link http://www.zentao.net - */ -?> - -
-
-
-
-

admin->sso;?>

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
sso->turnon; ?>sso->turnonList, $turnon);?>
sso->redirect; ?>sso->turnonList, $redirect);?>
sso->addr; ?>sso->addrNotice}'");?>
sso->code; ?>
sso->key; ?>
- - -
-
-
sso->help?>
-
-
- diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index fcc899aaf1..bf684f37dc 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1829,7 +1829,6 @@ $lang->resource->admin->index = 'index'; $lang->resource->admin->checkDB = 'checkDB'; $lang->resource->admin->safe = 'safeIndex'; $lang->resource->admin->checkWeak = 'checkWeak'; -$lang->resource->admin->sso = 'ssoAction'; $lang->resource->admin->register = 'register'; $lang->resource->admin->ztCompany = 'ztCompany'; $lang->resource->admin->resetPWDSetting = 'resetPWDSetting'; @@ -1839,7 +1838,6 @@ $lang->admin->methodOrder[0] = 'index'; $lang->admin->methodOrder[5] = 'checkDB'; $lang->admin->methodOrder[10] = 'safeIndex'; $lang->admin->methodOrder[15] = 'checkWeak'; -$lang->admin->methodOrder[20] = 'sso'; $lang->admin->methodOrder[25] = 'register'; $lang->admin->methodOrder[30] = 'ztCompany'; $lang->admin->methodOrder[35] = 'resetPWDSetting'; From 4017c453dc10457022c329d0a4b4218a40342fe2 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 15:37:17 +0800 Subject: [PATCH 228/347] - Delete the privilege of stakeholder-deleteExpect. --- db/zentao.sql | 6 ------ module/group/lang/resource.php | 2 -- module/project/config.php | 2 +- module/stakeholder/lang/de.php | 1 - module/stakeholder/lang/en.php | 1 - module/stakeholder/lang/fr.php | 1 - module/stakeholder/lang/zh-cn.php | 1 - 7 files changed, 1 insertion(+), 13 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 1a4b3efe12..47ed589c27 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2576,7 +2576,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'stakeholder','create'), (1,'stakeholder','createExpect'), (1,'stakeholder','delete'), -(1,'stakeholder','deleteExpect'), (1,'stakeholder','edit'), (1,'stakeholder','editExpect'), (1,'stakeholder','expect'), @@ -3764,7 +3763,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'stakeholder','create'), (4,'stakeholder','createExpect'), (4,'stakeholder','delete'), -(4,'stakeholder','deleteExpect'), (4,'stakeholder','edit'), (4,'stakeholder','editExpect'), (4,'stakeholder','expect'), @@ -4282,7 +4280,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'stakeholder','create'), (5,'stakeholder','createExpect'), (5,'stakeholder','delete'), -(5,'stakeholder','deleteExpect'), (5,'stakeholder','edit'), (5,'stakeholder','editExpect'), (5,'stakeholder','expect'), @@ -4695,7 +4692,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'stakeholder','browse'), (6,'stakeholder','communicate'), (6,'stakeholder','createExpect'), -(6,'stakeholder','deleteExpect'), (6,'stakeholder','editExpect'), (6,'stakeholder','expect'), (6,'stakeholder','issue'), @@ -5084,7 +5080,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'stakeholder','create'), (7,'stakeholder','createExpect'), (7,'stakeholder','delete'), -(7,'stakeholder','deleteExpect'), (7,'stakeholder','edit'), (7,'stakeholder','editExpect'), (7,'stakeholder','expect'), @@ -5855,7 +5850,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'stakeholder','create'), (9,'stakeholder','createExpect'), (9,'stakeholder','delete'), -(9,'stakeholder','deleteExpect'), (9,'stakeholder','edit'), (9,'stakeholder','editExpect'), (9,'stakeholder','expect'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index bf684f37dc..1b8fb90630 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -332,7 +332,6 @@ $lang->resource->stakeholder->view = 'viewAction'; $lang->resource->stakeholder->issue = 'issue'; $lang->resource->stakeholder->communicate = 'communicate'; $lang->resource->stakeholder->expect = 'expect'; -$lang->resource->stakeholder->deleteExpect = 'deleteExpect'; $lang->resource->stakeholder->createExpect = 'createExpect'; $lang->resource->stakeholder->editExpect = 'editExpect'; $lang->resource->stakeholder->viewExpect = 'viewExpect'; @@ -347,7 +346,6 @@ $lang->stakeholder->methodOrder[30] = 'view'; $lang->stakeholder->methodOrder[35] = 'issue'; $lang->stakeholder->methodOrder[45] = 'communicate'; $lang->stakeholder->methodOrder[50] = 'expect'; -$lang->stakeholder->methodOrder[60] = 'deleteExpect'; $lang->stakeholder->methodOrder[65] = 'createExpect'; $lang->stakeholder->methodOrder[70] = 'editExpect'; $lang->stakeholder->methodOrder[75] = 'viewExpect'; diff --git a/module/project/config.php b/module/project/config.php index 7712dba71c..dbb4c9f0cb 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -214,4 +214,4 @@ $config->project->includedPriv['repo'] = array('create', 'showSyncCommit', $config->project->includedPriv['testreport'] = array('create', 'view', 'delete', 'edit', 'export'); $config->project->includedPriv['auditplan'] = array('browse', 'create', 'edit', 'batchCreate', 'batchCheck', 'check', 'nc', 'result', 'assignTo'); $config->project->includedPriv['execution'] = array('create', 'start', 'delete', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt'); -if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'deleteExpect', 'createExpect', 'editExpect', 'viewExpect'); +if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'createExpect', 'editExpect', 'viewExpect'); diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php index 83f9b5dd64..7c8f727bf2 100644 --- a/module/stakeholder/lang/de.php +++ b/module/stakeholder/lang/de.php @@ -18,7 +18,6 @@ $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; $lang->stakeholder->createExpect = 'Add Expectation'; -$lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php index 82dae78ea0..560d75f47e 100644 --- a/module/stakeholder/lang/en.php +++ b/module/stakeholder/lang/en.php @@ -18,7 +18,6 @@ $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; $lang->stakeholder->createExpect = 'Add Expectation'; -$lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php index 83f9b5dd64..7c8f727bf2 100644 --- a/module/stakeholder/lang/fr.php +++ b/module/stakeholder/lang/fr.php @@ -18,7 +18,6 @@ $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; $lang->stakeholder->createExpect = 'Add Expectation'; -$lang->stakeholder->deleteExpect = 'Delete Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index 20a71f8f3d..2f4c4c5051 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -18,7 +18,6 @@ $lang->stakeholder->communicate = '沟通记录'; $lang->stakeholder->expect = '期望内容'; $lang->stakeholder->progress = '达成进展'; $lang->stakeholder->createExpect = '添加期望'; -$lang->stakeholder->deleteExpect = '删除期望'; $lang->stakeholder->editExpect = '编辑期望'; $lang->stakeholder->viewExpect = '期望信息'; $lang->stakeholder->issue = '问题管理'; From ae3d710996ab5e8efb34751cf343743e9bb08799 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:37:18 +0800 Subject: [PATCH 229/347] - Delete the privilege of admin-checkDB. --- module/admin/control.php | 17 ----------------- module/admin/lang/de.php | 1 - module/admin/lang/en.php | 1 - module/admin/lang/fr.php | 1 - module/admin/lang/zh-cn.php | 1 - module/group/lang/resource.php | 2 -- 6 files changed, 23 deletions(-) diff --git a/module/admin/control.php b/module/admin/control.php index 30ccbb0340..85387184bc 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -205,23 +205,6 @@ class admin extends control $this->display(); } - /** - * Check all tables. - * - * @access public - * @return void - */ - public function checkDB() - { - $tables = $this->dbh->query("show full tables where Table_Type != 'VIEW'")->fetchAll(PDO::FETCH_ASSOC); - foreach($tables as $table) - { - $tableName = current($table); - $result = $this->dbh->query("REPAIR TABLE $tableName")->fetch(); - echo "Repairing TABLE: " . $result->Table . (defined('IN_SHELL') ? "\t" : "    ") . $result->Msg_type . ":" . $result->Msg_text . (defined('IN_SHELL') ? "\n" : "
\n"); - } - } - /** * Account safe. * diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index 460253037a..c4a89a2938 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -10,7 +10,6 @@ * @link http://www.zentao.net */ $lang->admin->index = 'Admin Home'; -$lang->admin->checkDB = 'Datenbank prüfen'; $lang->admin->safeIndex = 'Sicherheit'; $lang->admin->checkWeak = 'Schwache Passwörter prüfen'; $lang->admin->certifyMobile = 'Prüfen Sie die Mobilnummer'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 2122516210..62ee508883 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -10,7 +10,6 @@ * @link http://www.zentao.net */ $lang->admin->index = 'Admin Home'; -$lang->admin->checkDB = 'Check Database'; $lang->admin->safeIndex = 'Security'; $lang->admin->checkWeak = 'Check Weak Password'; $lang->admin->certifyMobile = 'Verify your cellphone'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index c4734a07c7..7a6b1b027e 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -10,7 +10,6 @@ * @link http://www.zentao.net */ $lang->admin->index = 'Admin Home'; -$lang->admin->checkDB = 'Check Database'; $lang->admin->safeIndex = 'Sécurité'; $lang->admin->checkWeak = 'Contrôle niveau de sécurité des mots de passe'; $lang->admin->certifyMobile = 'Vérifier votre smartphone'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 138170253a..6c86b8bc9f 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -10,7 +10,6 @@ * @link http://www.zentao.net */ $lang->admin->index = '后台管理首页'; -$lang->admin->checkDB = '检查数据库'; $lang->admin->safeIndex = '安全'; $lang->admin->checkWeak = '弱口令检查'; $lang->admin->certifyMobile = '认证手机'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index bf684f37dc..7943613ea6 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1826,7 +1826,6 @@ $lang->search->methodOrder[35] = 'buildIndex'; /* Admin. */ $lang->resource->admin = new stdclass(); $lang->resource->admin->index = 'index'; -$lang->resource->admin->checkDB = 'checkDB'; $lang->resource->admin->safe = 'safeIndex'; $lang->resource->admin->checkWeak = 'checkWeak'; $lang->resource->admin->register = 'register'; @@ -1835,7 +1834,6 @@ $lang->resource->admin->resetPWDSetting = 'resetPWDSetting'; $lang->resource->admin->tableEngine = 'tableEngine'; $lang->admin->methodOrder[0] = 'index'; -$lang->admin->methodOrder[5] = 'checkDB'; $lang->admin->methodOrder[10] = 'safeIndex'; $lang->admin->methodOrder[15] = 'checkWeak'; $lang->admin->methodOrder[25] = 'register'; From e47ba3272f3fe99660b5aca1bbbda8b4b284fef7 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:38:16 +0800 Subject: [PATCH 230/347] - Delete the privilege of admin-checkDB. --- db/zentao.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/db/zentao.sql b/db/zentao.sql index 47ed589c27..5cb1a41af1 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2131,7 +2131,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'action','hideOne'), (1,'action','trash'), (1,'action','undelete'), -(1,'admin','checkDB'), (1,'admin','checkWeak'), (1,'admin','index'), (1,'admin','register'), From a743efd18f28c28525e6075fef39fb04660d4fd1 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:38:34 +0800 Subject: [PATCH 231/347] - Delete the privilege of admin-sso. --- db/zentao.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/db/zentao.sql b/db/zentao.sql index 5cb1a41af1..2d7df1f21a 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2135,7 +2135,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'admin','index'), (1,'admin','register'), (1,'admin','safe'), -(1,'admin','sso'), (1,'admin','ztCompany'), (1,'api','debug'), (1,'api','getModel'), From 171522e66a09fb799e17ac986399a059f2e1cfc0 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:39:12 +0800 Subject: [PATCH 232/347] - Delete the privilege of user-cropAvatar. --- db/zentao.sql | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 2d7df1f21a..f73a578c4b 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2749,7 +2749,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'user','batchEdit'), (1,'user','bug'), (1,'user','create'), -(1,'user','cropAvatar'), (1,'user','delete'), (1,'user','dynamic'), (1,'user','edit'), @@ -3093,7 +3092,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'tree','updateOrder'), (2,'user','batchEdit'), (2,'user','bug'), -(2,'user','cropAvatar'), (2,'user','dynamic'), (2,'user','execution'), (2,'user','issue'), @@ -3409,7 +3407,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'todo','start'), (3,'todo','view'), (3,'user','bug'), -(3,'user','cropAvatar'), (3,'user','dynamic'), (3,'user','execution'), (3,'user','issue'), @@ -3933,7 +3930,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'tree','manageChild'), (4,'tree','updateOrder'), (4,'user','bug'), -(4,'user','cropAvatar'), (4,'user','dynamic'), (4,'user','execution'), (4,'user','issue'), @@ -4409,7 +4405,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'tree','manageChild'), (5,'tree','updateOrder'), (5,'user','bug'), -(5,'user','cropAvatar'), (5,'user','dynamic'), (5,'user','execution'), (5,'user','issue'), @@ -4797,7 +4792,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'tree','manageChild'), (6,'tree','updateOrder'), (6,'user','bug'), -(6,'user','cropAvatar'), (6,'user','dynamic'), (6,'user','execution'), (6,'user','issue'), @@ -5203,7 +5197,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'tree','manageChild'), (7,'tree','updateOrder'), (7,'user','bug'), -(7,'user','cropAvatar'), (7,'user','dynamic'), (7,'user','execution'), (7,'user','issue'), @@ -5596,7 +5589,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'tree','manageChild'), (8,'tree','updateOrder'), (8,'user','bug'), -(8,'user','cropAvatar'), (8,'user','dynamic'), (8,'user','execution'), (8,'user','issue'), @@ -5939,7 +5931,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'user','batchEdit'), (9,'user','bug'), (9,'user','create'), -(9,'user','cropAvatar'), (9,'user','delete'), (9,'user','dynamic'), (9,'user','edit'), @@ -6183,7 +6174,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10,'todo','start'), (10,'todo','view'), (10,'user','bug'), -(10,'user','cropAvatar'), (10,'user','dynamic'), (10,'user','execution'), (10,'user','issue'), @@ -6439,7 +6429,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'todo','start'), (11,'todo','view'), (11,'user','bug'), -(11,'user','cropAvatar'), (11,'user','dynamic'), (11,'user','execution'), (11,'user','issue'), From 3e8be12718091003b83e083413bf1e1028e5e30f Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:39:38 +0800 Subject: [PATCH 233/347] - Delete the privilege of company-index. --- db/zentao.sql | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index f73a578c4b..a4dfb48dda 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2200,7 +2200,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'company','browse'), (1,'company','dynamic'), (1,'company','edit'), -(1,'company','index'), (1,'company','view'), (1,'compile','browse'), (1,'compile','logs'), @@ -2821,7 +2820,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'company','browse'), (2,'company','dynamic'), (2,'company','edit'), -(2,'company','index'), (2,'company','view'), (2,'custom','execution'), (2,'custom','flow'), @@ -3144,7 +3142,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'caselib','view'), (3,'company','browse'), (3,'company','dynamic'), -(3,'company','index'), (3,'company','view'), (3,'datatable','setGlobal'), (3,'doc','mySpace'), @@ -3478,7 +3475,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'company','browse'), (4,'company','dynamic'), (4,'company','edit'), -(4,'company','index'), (4,'company','view'), (4,'compile','browse'), (4,'compile','logs'), @@ -3991,7 +3987,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'build','view'), (5,'company','browse'), (5,'company','dynamic'), -(5,'company','index'), (5,'company','view'), (5,'compile','browse'), (5,'compile','logs'), @@ -4459,7 +4454,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'build','view'), (6,'company','browse'), (6,'company','dynamic'), -(6,'company','index'), (6,'company','view'), (6,'datatable','setGlobal'), (6,'doc','mySpace'), @@ -4847,7 +4841,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'build','view'), (7,'company','browse'), (7,'company','dynamic'), -(7,'company','index'), (7,'company','view'), (7,'datatable','setGlobal'), (7,'doc','mySpace'), @@ -5262,7 +5255,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'ci','commitResult'), (8,'company','browse'), (8,'company','dynamic'), -(8,'company','index'), (8,'company','view'), (8,'compile','browse'), (8,'compile','logs'), @@ -5639,7 +5631,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'company','browse'), (9,'company','dynamic'), (9,'company','edit'), -(9,'company','index'), (9,'company','view'), (9,'custom','index'), (9,'custom','restore'), @@ -5975,7 +5966,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10,'build','view'), (10,'company','browse'), (10,'company','dynamic'), -(10,'company','index'), (10,'company','view'), (10,'doc','mySpace'), (10,'doc','myView'), @@ -6217,7 +6207,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'build','view'), (11,'company','browse'), (11,'company','dynamic'), -(11,'company','index'), (11,'company','view'), (11,'doc','mySpace'), (11,'doc','myView'), From fb6943463c482b8bf6a229fe15c11de5793f5aad Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:40:18 +0800 Subject: [PATCH 234/347] - Delete the privilege of caselib-index. --- db/zentao.sql | 5 ----- 1 file changed, 5 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index a4dfb48dda..5b4ae4f4f1 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2192,7 +2192,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'caselib','edit'), (1,'caselib','exportTemplet'), (1,'caselib','import'), -(1,'caselib','index'), (1,'caselib','showImport'), (1,'caselib','view'), (1,'ci','checkCompileStatus'), @@ -2815,7 +2814,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'build','unlinkStory'), (2,'build','view'), (2,'caselib','browse'), -(2,'caselib','index'), (2,'caselib','view'), (2,'company','browse'), (2,'company','dynamic'), @@ -3137,7 +3135,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'caselib','createCase'), (3,'caselib','exportTemplet'), (3,'caselib','import'), -(3,'caselib','index'), (3,'caselib','showImport'), (3,'caselib','view'), (3,'company','browse'), @@ -3467,7 +3464,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'caselib','edit'), (4,'caselib','exportTemplet'), (4,'caselib','import'), -(4,'caselib','index'), (4,'caselib','showImport'), (4,'caselib','view'), (4,'ci','checkCompileStatus'), @@ -5248,7 +5244,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'caselib','edit'), (8,'caselib','exportTemplet'), (8,'caselib','import'), -(8,'caselib','index'), (8,'caselib','showImport'), (8,'caselib','view'), (8,'ci','checkCompileStatus'), From 43fc3024c6e944c0000328a83880781a07168c7f Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:40:48 +0800 Subject: [PATCH 235/347] - Delete the privilege of testsuite-index. --- db/zentao.sql | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 5b4ae4f4f1..c721f2b273 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2693,7 +2693,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'testsuite','create'), (1,'testsuite','delete'), (1,'testsuite','edit'), -(1,'testsuite','index'), (1,'testsuite','linkCase'), (1,'testsuite','unlinkCase'), (1,'testsuite','view'), @@ -3038,7 +3037,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'testreport','edit'), (2,'testreport','view'), (2,'testsuite','browse'), -(2,'testsuite','index'), (2,'testsuite','view'), (2,'testtask','activate'), (2,'testtask','batchAssign'), @@ -3358,7 +3356,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'testsuite','create'), (3,'testsuite','delete'), (3,'testsuite','edit'), -(3,'testsuite','index'), (3,'testsuite','linkCase'), (3,'testsuite','unlinkCase'), (3,'testsuite','view'), @@ -3871,7 +3868,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'testsuite','create'), (4,'testsuite','delete'), (4,'testsuite','edit'), -(4,'testsuite','index'), (4,'testsuite','linkCase'), (4,'testsuite','unlinkCase'), (4,'testsuite','view'), @@ -4362,7 +4358,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'testreport','edit'), (5,'testreport','view'), (5,'testsuite','browse'), -(5,'testsuite','index'), (5,'testsuite','view'), (5,'testtask','browse'), (5,'testtask','cases'), @@ -4733,7 +4728,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'testreport','edit'), (6,'testreport','view'), (6,'testsuite','browse'), -(6,'testsuite','index'), (6,'testsuite','view'), (6,'testtask','activate'), (6,'testtask','batchAssign'), @@ -5152,7 +5146,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'testreport','export'), (7,'testreport','view'), (7,'testsuite','browse'), -(7,'testsuite','index'), (7,'testsuite','view'), (7,'testtask','browse'), (7,'testtask','cases'), @@ -5525,7 +5518,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'testsuite','create'), (8,'testsuite','delete'), (8,'testsuite','edit'), -(8,'testsuite','index'), (8,'testsuite','linkCase'), (8,'testsuite','unlinkCase'), (8,'testsuite','view'), @@ -5887,7 +5879,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'testreport','edit'), (9,'testreport','view'), (9,'testsuite','browse'), -(9,'testsuite','index'), (9,'testsuite','view'), (9,'testtask','browse'), (9,'testtask','cases'), @@ -6134,7 +6125,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (10,'testreport','browse'), (10,'testreport','view'), (10,'testsuite','browse'), -(10,'testsuite','index'), (10,'testsuite','view'), (10,'testtask','browse'), (10,'testtask','cases'), @@ -6388,7 +6378,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'testreport','browse'), (11,'testreport','view'), (11,'testsuite','browse'), -(11,'testsuite','index'), (11,'testsuite','view'), (11,'testtask','browse'), (11,'testtask','cases'), From 828175f33b13aac60e21f03eb1ec1a59a4c7f1c3 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:41:22 +0800 Subject: [PATCH 236/347] - Delete the privilege of testcase-showImport. --- db/zentao.sql | 4 ---- 1 file changed, 4 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index c721f2b273..0c2aedb45f 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2681,7 +2681,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'testcase','index'), (1,'testcase','linkCases'), (1,'testcase','review'), -(1,'testcase','showImport'), (1,'testcase','view'), (1,'testreport','browse'), (1,'testreport','create'), @@ -3347,7 +3346,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'testcase','importFromLib'), (3,'testcase','linkCases'), (3,'testcase','review'), -(3,'testcase','showImport'), (3,'testcase','view'), (3,'testreport','browse'), (3,'testreport','view'), @@ -3856,7 +3854,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'testcase','importFromLib'), (4,'testcase','linkCases'), (4,'testcase','review'), -(4,'testcase','showImport'), (4,'testcase','view'), (4,'testreport','browse'), (4,'testreport','create'), @@ -5506,7 +5503,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'testcase','index'), (8,'testcase','linkCases'), (8,'testcase','review'), -(8,'testcase','showImport'), (8,'testcase','view'), (8,'testreport','browse'), (8,'testreport','create'), From 82ead79df0b5a478cbfa17d6af2e2e5b0e1ac8f8 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 15:45:33 +0800 Subject: [PATCH 237/347] - Delete the privilege of stakeholder-createExpect. --- db/zentao.sql | 6 ------ module/group/lang/resource.php | 2 -- module/project/config.php | 2 +- module/stakeholder/lang/de.php | 1 - module/stakeholder/lang/en.php | 1 - module/stakeholder/lang/fr.php | 1 - module/stakeholder/lang/zh-cn.php | 1 - 7 files changed, 1 insertion(+), 13 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 0c2aedb45f..8b0555d41c 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2570,7 +2570,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'stakeholder','browse'), (1,'stakeholder','communicate'), (1,'stakeholder','create'), -(1,'stakeholder','createExpect'), (1,'stakeholder','delete'), (1,'stakeholder','edit'), (1,'stakeholder','editExpect'), @@ -3743,7 +3742,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'stakeholder','browse'), (4,'stakeholder','communicate'), (4,'stakeholder','create'), -(4,'stakeholder','createExpect'), (4,'stakeholder','delete'), (4,'stakeholder','edit'), (4,'stakeholder','editExpect'), @@ -4256,7 +4254,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'stakeholder','batchCreate'), (5,'stakeholder','communicate'), (5,'stakeholder','create'), -(5,'stakeholder','createExpect'), (5,'stakeholder','delete'), (5,'stakeholder','edit'), (5,'stakeholder','editExpect'), @@ -4666,7 +4663,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'search','select'), (6,'stakeholder','browse'), (6,'stakeholder','communicate'), -(6,'stakeholder','createExpect'), (6,'stakeholder','editExpect'), (6,'stakeholder','expect'), (6,'stakeholder','issue'), @@ -5050,7 +5046,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'stakeholder','browse'), (7,'stakeholder','communicate'), (7,'stakeholder','create'), -(7,'stakeholder','createExpect'), (7,'stakeholder','delete'), (7,'stakeholder','edit'), (7,'stakeholder','editExpect'), @@ -5812,7 +5807,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'stakeholder','browse'), (9,'stakeholder','communicate'), (9,'stakeholder','create'), -(9,'stakeholder','createExpect'), (9,'stakeholder','delete'), (9,'stakeholder','edit'), (9,'stakeholder','editExpect'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index a9a8126320..ad01b232b9 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -332,7 +332,6 @@ $lang->resource->stakeholder->view = 'viewAction'; $lang->resource->stakeholder->issue = 'issue'; $lang->resource->stakeholder->communicate = 'communicate'; $lang->resource->stakeholder->expect = 'expect'; -$lang->resource->stakeholder->createExpect = 'createExpect'; $lang->resource->stakeholder->editExpect = 'editExpect'; $lang->resource->stakeholder->viewExpect = 'viewExpect'; $lang->resource->stakeholder->userIssue = 'userIssue'; @@ -346,7 +345,6 @@ $lang->stakeholder->methodOrder[30] = 'view'; $lang->stakeholder->methodOrder[35] = 'issue'; $lang->stakeholder->methodOrder[45] = 'communicate'; $lang->stakeholder->methodOrder[50] = 'expect'; -$lang->stakeholder->methodOrder[65] = 'createExpect'; $lang->stakeholder->methodOrder[70] = 'editExpect'; $lang->stakeholder->methodOrder[75] = 'viewExpect'; $lang->stakeholder->methodOrder[80] = 'userIssue'; diff --git a/module/project/config.php b/module/project/config.php index dbb4c9f0cb..5db6e96a6d 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -214,4 +214,4 @@ $config->project->includedPriv['repo'] = array('create', 'showSyncCommit', $config->project->includedPriv['testreport'] = array('create', 'view', 'delete', 'edit', 'export'); $config->project->includedPriv['auditplan'] = array('browse', 'create', 'edit', 'batchCreate', 'batchCheck', 'check', 'nc', 'result', 'assignTo'); $config->project->includedPriv['execution'] = array('create', 'start', 'delete', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt'); -if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'createExpect', 'editExpect', 'viewExpect'); +if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'editExpect', 'viewExpect'); diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php index 7c8f727bf2..0bfb797cc7 100644 --- a/module/stakeholder/lang/de.php +++ b/module/stakeholder/lang/de.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php index 560d75f47e..2898283277 100644 --- a/module/stakeholder/lang/en.php +++ b/module/stakeholder/lang/en.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php index 7c8f727bf2..0bfb797cc7 100644 --- a/module/stakeholder/lang/fr.php +++ b/module/stakeholder/lang/fr.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->createExpect = 'Add Expectation'; $lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index 2f4c4c5051..b12866d113 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = '新建'; $lang->stakeholder->communicate = '沟通记录'; $lang->stakeholder->expect = '期望内容'; $lang->stakeholder->progress = '达成进展'; -$lang->stakeholder->createExpect = '添加期望'; $lang->stakeholder->editExpect = '编辑期望'; $lang->stakeholder->viewExpect = '期望信息'; $lang->stakeholder->issue = '问题管理'; From 5b69116873c78ce545aec08a82df14c3c8e75ce9 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:52:09 +0800 Subject: [PATCH 238/347] + Revert the privilege of admin-sso --- db/zentao.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/zentao.sql b/db/zentao.sql index 0c2aedb45f..0d5efd43e5 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2135,6 +2135,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'admin','index'), (1,'admin','register'), (1,'admin','safe'), +(1,'admin','sso'), (1,'admin','ztCompany'), (1,'api','debug'), (1,'api','getModel'), From 268c7f3271fb57a15e0db9febf0bd2a1dc4de0e8 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:53:59 +0800 Subject: [PATCH 239/347] + Revert the privilege of admin-sso. --- module/admin/control.php | 37 +++++++++++++++++++++++ module/admin/lang/de.php | 2 ++ module/admin/lang/en.php | 2 ++ module/admin/lang/fr.php | 2 ++ module/admin/lang/zh-cn.php | 2 ++ module/admin/view/sso.html.php | 54 ++++++++++++++++++++++++++++++++++ module/group/lang/resource.php | 2 ++ 7 files changed, 101 insertions(+) create mode 100755 module/admin/view/sso.html.php diff --git a/module/admin/control.php b/module/admin/control.php index 85387184bc..4072a11162 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -239,6 +239,43 @@ class admin extends control $this->display(); } + /** + * Config sso for ranzhi. + * + * @access public + * @return void + */ + public function sso() + { + if(!empty($_POST)) + { + $ssoConfig = new stdclass(); + $ssoConfig->turnon = $this->post->turnon; + $ssoConfig->redirect = $this->post->redirect; + $ssoConfig->addr = $this->post->addr; + $ssoConfig->code = trim($this->post->code); + $ssoConfig->key = trim($this->post->key); + + if(!$ssoConfig->turnon) $ssoConfig->redirect = $ssoConfig->turnon; + $this->loadModel('setting')->setItems('system.sso', $ssoConfig); + if(dao::isError()) return print(js::error(dao::getError())); + return print($this->locate(inlink('sso'))); + } + + $this->loadModel('sso'); + if(!isset($this->config->sso)) $this->config->sso = new stdclass(); + + $this->view->title = $this->lang->admin->sso; + $this->view->position[] = $this->lang->admin->sso; + + $this->view->turnon = isset($this->config->sso->turnon) ? $this->config->sso->turnon : 1; + $this->view->redirect = isset($this->config->sso->redirect) ? $this->config->sso->redirect : 0; + $this->view->addr = isset($this->config->sso->addr) ? $this->config->sso->addr : ''; + $this->view->key = isset($this->config->sso->key) ? $this->config->sso->key : ''; + $this->view->code = isset($this->config->sso->code) ? $this->config->sso->code : ''; + $this->display(); + } + /** * Set closed features config. * diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index c4a89a2938..f0d85ba9c5 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -10,6 +10,8 @@ * @link http://www.zentao.net */ $lang->admin->index = 'Admin Home'; +$lang->admin->sso = 'SSO'; +$lang->admin->ssoAction = 'Link Zdoo'; $lang->admin->safeIndex = 'Sicherheit'; $lang->admin->checkWeak = 'Schwache Passwörter prüfen'; $lang->admin->certifyMobile = 'Prüfen Sie die Mobilnummer'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 62ee508883..897a0bb8ac 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -10,6 +10,8 @@ * @link http://www.zentao.net */ $lang->admin->index = 'Admin Home'; +$lang->admin->sso = 'Zdoo'; +$lang->admin->ssoAction = 'Link Zdoo'; $lang->admin->safeIndex = 'Security'; $lang->admin->checkWeak = 'Check Weak Password'; $lang->admin->certifyMobile = 'Verify your cellphone'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 7a6b1b027e..a21cd5788e 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -10,6 +10,8 @@ * @link http://www.zentao.net */ $lang->admin->index = 'Admin Home'; +$lang->admin->sso = 'Zdoo'; +$lang->admin->ssoAction = 'Link Zdoo'; $lang->admin->safeIndex = 'Sécurité'; $lang->admin->checkWeak = 'Contrôle niveau de sécurité des mots de passe'; $lang->admin->certifyMobile = 'Vérifier votre smartphone'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 6c86b8bc9f..fd330527f0 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -10,6 +10,8 @@ * @link http://www.zentao.net */ $lang->admin->index = '后台管理首页'; +$lang->admin->sso = 'ZDOO集成'; +$lang->admin->ssoAction = 'ZDOO集成'; $lang->admin->safeIndex = '安全'; $lang->admin->checkWeak = '弱口令检查'; $lang->admin->certifyMobile = '认证手机'; diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php new file mode 100755 index 0000000000..2bc03ea14b --- /dev/null +++ b/module/admin/view/sso.html.php @@ -0,0 +1,54 @@ + + * @package admin + * @version $Id$ + * @link http://www.zentao.net + */ +?> + +
+
+
+
+

admin->sso;?>

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
sso->turnon; ?>sso->turnonList, $turnon);?>
sso->redirect; ?>sso->turnonList, $redirect);?>
sso->addr; ?>sso->addrNotice}'");?>
sso->code; ?>
sso->key; ?>
+ + +
+
+
sso->help?>
+
+
+ diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index ad01b232b9..3a19f971c4 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1824,6 +1824,7 @@ $lang->resource->admin = new stdclass(); $lang->resource->admin->index = 'index'; $lang->resource->admin->safe = 'safeIndex'; $lang->resource->admin->checkWeak = 'checkWeak'; +$lang->resource->admin->sso = 'ssoAction'; $lang->resource->admin->register = 'register'; $lang->resource->admin->ztCompany = 'ztCompany'; $lang->resource->admin->resetPWDSetting = 'resetPWDSetting'; @@ -1832,6 +1833,7 @@ $lang->resource->admin->tableEngine = 'tableEngine'; $lang->admin->methodOrder[0] = 'index'; $lang->admin->methodOrder[10] = 'safeIndex'; $lang->admin->methodOrder[15] = 'checkWeak'; +$lang->admin->methodOrder[20] = 'sso'; $lang->admin->methodOrder[25] = 'register'; $lang->admin->methodOrder[30] = 'ztCompany'; $lang->admin->methodOrder[35] = 'resetPWDSetting'; From e5bd957cd09be32c618a4d5d4448ab4c01d600f8 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 15:54:42 +0800 Subject: [PATCH 240/347] - Delete the privilege of stakeholder-editExpect. --- db/zentao.sql | 6 ------ module/group/lang/resource.php | 2 -- module/project/config.php | 2 +- module/stakeholder/lang/de.php | 1 - module/stakeholder/lang/en.php | 1 - module/stakeholder/lang/fr.php | 1 - module/stakeholder/lang/zh-cn.php | 1 - 7 files changed, 1 insertion(+), 13 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 1e94e8b361..cbeeaf1fbf 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2573,7 +2573,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'stakeholder','create'), (1,'stakeholder','delete'), (1,'stakeholder','edit'), -(1,'stakeholder','editExpect'), (1,'stakeholder','expect'), (1,'stakeholder','issue'), (1,'stakeholder','plan'), @@ -3745,7 +3744,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'stakeholder','create'), (4,'stakeholder','delete'), (4,'stakeholder','edit'), -(4,'stakeholder','editExpect'), (4,'stakeholder','expect'), (4,'stakeholder','issue'), (4,'stakeholder','plan'), @@ -4257,7 +4255,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'stakeholder','create'), (5,'stakeholder','delete'), (5,'stakeholder','edit'), -(5,'stakeholder','editExpect'), (5,'stakeholder','expect'), (5,'stakeholder','issue'), (5,'stakeholder','plan'), @@ -4664,7 +4661,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'search','select'), (6,'stakeholder','browse'), (6,'stakeholder','communicate'), -(6,'stakeholder','editExpect'), (6,'stakeholder','expect'), (6,'stakeholder','issue'), (6,'stakeholder','userIssue'), @@ -5049,7 +5045,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'stakeholder','create'), (7,'stakeholder','delete'), (7,'stakeholder','edit'), -(7,'stakeholder','editExpect'), (7,'stakeholder','expect'), (7,'stakeholder','issue'), (7,'stakeholder','userIssue'), @@ -5810,7 +5805,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'stakeholder','create'), (9,'stakeholder','delete'), (9,'stakeholder','edit'), -(9,'stakeholder','editExpect'), (9,'stakeholder','expect'), (9,'stakeholder','issue'), (9,'stakeholder','plan'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 3a19f971c4..3759549957 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -332,7 +332,6 @@ $lang->resource->stakeholder->view = 'viewAction'; $lang->resource->stakeholder->issue = 'issue'; $lang->resource->stakeholder->communicate = 'communicate'; $lang->resource->stakeholder->expect = 'expect'; -$lang->resource->stakeholder->editExpect = 'editExpect'; $lang->resource->stakeholder->viewExpect = 'viewExpect'; $lang->resource->stakeholder->userIssue = 'userIssue'; @@ -345,7 +344,6 @@ $lang->stakeholder->methodOrder[30] = 'view'; $lang->stakeholder->methodOrder[35] = 'issue'; $lang->stakeholder->methodOrder[45] = 'communicate'; $lang->stakeholder->methodOrder[50] = 'expect'; -$lang->stakeholder->methodOrder[70] = 'editExpect'; $lang->stakeholder->methodOrder[75] = 'viewExpect'; $lang->stakeholder->methodOrder[80] = 'userIssue'; diff --git a/module/project/config.php b/module/project/config.php index 5db6e96a6d..b5da43efeb 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -214,4 +214,4 @@ $config->project->includedPriv['repo'] = array('create', 'showSyncCommit', $config->project->includedPriv['testreport'] = array('create', 'view', 'delete', 'edit', 'export'); $config->project->includedPriv['auditplan'] = array('browse', 'create', 'edit', 'batchCreate', 'batchCheck', 'check', 'nc', 'result', 'assignTo'); $config->project->includedPriv['execution'] = array('create', 'start', 'delete', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt'); -if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'editExpect', 'viewExpect'); +if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'viewExpect'); diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php index 0bfb797cc7..5c52091af5 100644 --- a/module/stakeholder/lang/de.php +++ b/module/stakeholder/lang/de.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php index 2898283277..4cf6129d43 100644 --- a/module/stakeholder/lang/en.php +++ b/module/stakeholder/lang/en.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php index 0bfb797cc7..5c52091af5 100644 --- a/module/stakeholder/lang/fr.php +++ b/module/stakeholder/lang/fr.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->editExpect = 'Edit Expectation'; $lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index b12866d113..80ebdb0670 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = '新建'; $lang->stakeholder->communicate = '沟通记录'; $lang->stakeholder->expect = '期望内容'; $lang->stakeholder->progress = '达成进展'; -$lang->stakeholder->editExpect = '编辑期望'; $lang->stakeholder->viewExpect = '期望信息'; $lang->stakeholder->issue = '问题管理'; $lang->stakeholder->userIssue = '干系人问题列表'; From ec5bedd7770ba0fac733e198195e7e973084d4b2 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 15:58:52 +0800 Subject: [PATCH 241/347] - Delete the privilege of admin-ztCompany. --- db/zentao.sql | 1 - module/group/lang/resource.php | 2 -- 2 files changed, 3 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index cbeeaf1fbf..422ba86caf 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2136,7 +2136,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'admin','register'), (1,'admin','safe'), (1,'admin','sso'), -(1,'admin','ztCompany'), (1,'api','debug'), (1,'api','getModel'), (1,'api','sql'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 3759549957..86e170ac08 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1824,7 +1824,6 @@ $lang->resource->admin->safe = 'safeIndex'; $lang->resource->admin->checkWeak = 'checkWeak'; $lang->resource->admin->sso = 'ssoAction'; $lang->resource->admin->register = 'register'; -$lang->resource->admin->ztCompany = 'ztCompany'; $lang->resource->admin->resetPWDSetting = 'resetPWDSetting'; $lang->resource->admin->tableEngine = 'tableEngine'; @@ -1833,7 +1832,6 @@ $lang->admin->methodOrder[10] = 'safeIndex'; $lang->admin->methodOrder[15] = 'checkWeak'; $lang->admin->methodOrder[20] = 'sso'; $lang->admin->methodOrder[25] = 'register'; -$lang->admin->methodOrder[30] = 'ztCompany'; $lang->admin->methodOrder[35] = 'resetPWDSetting'; $lang->admin->methodOrder[40] = 'tableEngine'; From 825600f1fe5b77a6b5a403b909f485c52f54b9a8 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 16:01:32 +0800 Subject: [PATCH 242/347] - Delete the privilege of custom-index. --- config/zentaopms.php | 1 + db/zentao.sql | 4 ---- module/custom/lang/de.php | 1 - module/custom/lang/en.php | 1 - module/custom/lang/fr.php | 1 - module/custom/lang/zh-cn.php | 1 - module/group/lang/resource.php | 2 -- 7 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index 0f5bde1250..3298971f93 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -235,6 +235,7 @@ $config->openMethods[] = 'testsuite.index'; $config->openMethods[] = 'caselib.index'; $config->openMethods[] = 'company.index'; $config->openMethods[] = 'user.cropAvatar'; +$config->openMethods[] = 'custom.index'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/db/zentao.sql b/db/zentao.sql index 422ba86caf..bab2f8037c 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2225,7 +2225,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'custom','editStoryConcept'), (1,'custom','execution'), (1,'custom','flow'), -(1,'custom','index'), (1,'custom','product'), (1,'custom','project'), (1,'custom','restore'), @@ -2817,7 +2816,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'company','view'), (2,'custom','execution'), (2,'custom','flow'), -(2,'custom','index'), (2,'custom','product'), (2,'custom','restore'), (2,'custom','set'), @@ -5233,7 +5231,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'company','view'), (8,'compile','browse'), (8,'compile','logs'), -(8,'custom','index'), (8,'datatable','setGlobal'), (8,'doc','mySpace'), (8,'doc','myView'), @@ -5605,7 +5602,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'company','dynamic'), (9,'company','edit'), (9,'company','view'), -(9,'custom','index'), (9,'custom','restore'), (9,'custom','setPublic'), (9,'datatable','setGlobal'), diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index e35a1c5dbb..eb0da25734 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -3,7 +3,6 @@ global $config; $lang->custom->common = 'Custom'; $lang->custom->id = 'ID'; -$lang->custom->index = 'Home'; $lang->custom->set = 'Customize'; $lang->custom->restore = 'Reset to Default'; $lang->custom->key = 'Key'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 268fbab554..fac1663afb 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -3,7 +3,6 @@ global $config; $lang->custom->common = 'Custom'; $lang->custom->id = 'ID'; -$lang->custom->index = 'Home'; $lang->custom->set = 'Customize'; $lang->custom->restore = 'Reset'; $lang->custom->key = 'Key'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index fb3c6f4552..0a6292fae9 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -3,7 +3,6 @@ global $config; $lang->custom->common = 'Personnalisation'; $lang->custom->id = 'ID'; -$lang->custom->index = 'Accueil'; $lang->custom->set = 'Personnaliser'; $lang->custom->restore = 'Réinitialiser'; $lang->custom->key = 'Clé'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index b677dd0d0b..eafcbd0115 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -3,7 +3,6 @@ global $config; $lang->custom->common = '自定义'; $lang->custom->id = '编号'; -$lang->custom->index = '首页'; $lang->custom->set = '自定义配置'; $lang->custom->restore = '恢复默认'; $lang->custom->key = '键'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 86e170ac08..b4ba6c35dc 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1411,7 +1411,6 @@ $lang->mail->methodOrder[50] = 'resend'; /* Custom. */ $lang->resource->custom = new stdclass(); -$lang->resource->custom->index = 'index'; $lang->resource->custom->set = 'set'; $lang->resource->custom->product = 'productName'; $lang->resource->custom->execution = 'executionCommon'; @@ -1431,7 +1430,6 @@ $lang->resource->custom->hours = 'hours'; $lang->resource->custom->percent = 'percent'; $lang->resource->custom->limitTaskDate = 'beginAndEndDate'; -$lang->custom->methodOrder[5] = 'index'; $lang->custom->methodOrder[10] = 'set'; $lang->custom->methodOrder[15] = 'product'; $lang->custom->methodOrder[20] = 'execution'; From b8b114659c74c6d43db6887763f276841f0e2d07 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 16:04:53 +0800 Subject: [PATCH 243/347] - Delete the privilege of custom-setPublic. --- db/zentao.sql | 3 --- module/group/lang/resource.php | 2 -- 2 files changed, 5 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index bab2f8037c..04b7d8c9e2 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2231,7 +2231,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'custom','set'), (1,'custom','hours'), (1,'custom','setDefaultConcept'), -(1,'custom','setPublic'), (1,'custom','setStoryConcept'), (1,'custom','timezone'), (1,'custom','working'), @@ -2820,7 +2819,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'custom','restore'), (2,'custom','set'), (2,'custom','hours'), -(2,'custom','setPublic'), (2,'datatable','setGlobal'), (2,'dept','browse'), (2,'dept','delete'), @@ -5603,7 +5601,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'company','edit'), (9,'company','view'), (9,'custom','restore'), -(9,'custom','setPublic'), (9,'datatable','setGlobal'), (9,'dept','browse'), (9,'dept','delete'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index b4ba6c35dc..f557e402a4 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1417,7 +1417,6 @@ $lang->resource->custom->execution = 'executionCommon'; $lang->resource->custom->required = 'required'; $lang->resource->custom->restore = 'restore'; $lang->resource->custom->flow = 'flow'; -$lang->resource->custom->setPublic = 'setPublic'; $lang->resource->custom->timezone = 'timezone'; $lang->resource->custom->setStoryConcept = 'setStoryConcept'; $lang->resource->custom->editStoryConcept = 'editStoryConcept'; @@ -1436,7 +1435,6 @@ $lang->custom->methodOrder[20] = 'execution'; $lang->custom->methodOrder[25] = 'required'; $lang->custom->methodOrder[30] = 'restore'; $lang->custom->methodOrder[35] = 'flow'; -$lang->custom->methodOrder[40] = 'setPublic'; $lang->custom->methodOrder[45] = 'timezone'; $lang->custom->methodOrder[50] = 'setStoryConcept'; $lang->custom->methodOrder[55] = 'editStoryConcept'; From 1f9432a395a6a2e089bd4da5e4161c1e0c36efef Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 16:14:22 +0800 Subject: [PATCH 244/347] - Delete the privilege of stakeholder-viewExpect. --- db/zentao.sql | 7 ------- module/group/lang/resource.php | 2 -- module/project/config.php | 2 +- module/stakeholder/lang/de.php | 1 - module/stakeholder/lang/en.php | 1 - module/stakeholder/lang/fr.php | 1 - module/stakeholder/lang/zh-cn.php | 1 - 7 files changed, 1 insertion(+), 14 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 04b7d8c9e2..7c2d38a8c5 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2575,7 +2575,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'stakeholder','plan'), (1,'stakeholder','userIssue'), (1,'stakeholder','view'), -(1,'stakeholder','viewExpect'), (1,'story','activate'), (1,'story','assignTo'), (1,'story','batchAssignTo'), @@ -3744,7 +3743,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'stakeholder','plan'), (4,'stakeholder','userIssue'), (4,'stakeholder','view'), -(4,'stakeholder','viewExpect'), (4,'story','activate'), (4,'story','assignTo'), (4,'story','batchAssignTo'), @@ -4255,7 +4253,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'stakeholder','plan'), (5,'stakeholder','userIssue'), (5,'stakeholder','view'), -(5,'stakeholder','viewExpect'), (5,'story','activate'), (5,'story','assignTo'), (5,'story','batchAssignTo'), @@ -4660,7 +4657,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'stakeholder','issue'), (6,'stakeholder','userIssue'), (6,'stakeholder','view'), -(6,'stakeholder','viewExpect'), (6,'story','batchToTask'), (6,'story','bugs'), (6,'story','cases'), @@ -5044,7 +5040,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'stakeholder','issue'), (7,'stakeholder','userIssue'), (7,'stakeholder','view'), -(7,'stakeholder','viewExpect'), (7,'story','activate'), (7,'story','assignTo'), (7,'story','batchAssignTo'), @@ -5802,7 +5797,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'stakeholder','plan'), (9,'stakeholder','userIssue'), (9,'stakeholder','view'), -(9,'stakeholder','viewExpect'), (9,'story','bugs'), (9,'story','cases'), (9,'story','export'), @@ -6308,7 +6302,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'stakeholder','issue'), (11,'stakeholder','userIssue'), (11,'stakeholder','view'), -(11,'stakeholder','viewExpect'), (11,'story','bugs'), (11,'story','cases'), (11,'story','export'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index f557e402a4..5dc349bc6f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -332,7 +332,6 @@ $lang->resource->stakeholder->view = 'viewAction'; $lang->resource->stakeholder->issue = 'issue'; $lang->resource->stakeholder->communicate = 'communicate'; $lang->resource->stakeholder->expect = 'expect'; -$lang->resource->stakeholder->viewExpect = 'viewExpect'; $lang->resource->stakeholder->userIssue = 'userIssue'; $lang->stakeholder->methodOrder[5] = 'browse'; @@ -344,7 +343,6 @@ $lang->stakeholder->methodOrder[30] = 'view'; $lang->stakeholder->methodOrder[35] = 'issue'; $lang->stakeholder->methodOrder[45] = 'communicate'; $lang->stakeholder->methodOrder[50] = 'expect'; -$lang->stakeholder->methodOrder[75] = 'viewExpect'; $lang->stakeholder->methodOrder[80] = 'userIssue'; /* Design. */ diff --git a/module/project/config.php b/module/project/config.php index b5da43efeb..f6f28f2286 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -214,4 +214,4 @@ $config->project->includedPriv['repo'] = array('create', 'showSyncCommit', $config->project->includedPriv['testreport'] = array('create', 'view', 'delete', 'edit', 'export'); $config->project->includedPriv['auditplan'] = array('browse', 'create', 'edit', 'batchCreate', 'batchCheck', 'check', 'nc', 'result', 'assignTo'); $config->project->includedPriv['execution'] = array('create', 'start', 'delete', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt'); -if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect', 'viewExpect'); +if($config->edition != 'max') $config->project->includedPriv['stakeholder'] = array('browse', 'create', 'batchCreate', 'edit', 'delete', 'view', 'communicate', 'expect'); diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php index 5c52091af5..b048c21255 100644 --- a/module/stakeholder/lang/de.php +++ b/module/stakeholder/lang/de.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; $lang->stakeholder->deleted = 'Deleted'; diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php index 4cf6129d43..8d57b47f9c 100644 --- a/module/stakeholder/lang/en.php +++ b/module/stakeholder/lang/en.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; $lang->stakeholder->deleted = 'Deleted'; diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php index 5c52091af5..b048c21255 100644 --- a/module/stakeholder/lang/fr.php +++ b/module/stakeholder/lang/fr.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->viewExpect = 'Expectation Info'; $lang->stakeholder->issue = 'Issue Management'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; $lang->stakeholder->deleted = 'Deleted'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index 80ebdb0670..245ad03dad 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = '新建'; $lang->stakeholder->communicate = '沟通记录'; $lang->stakeholder->expect = '期望内容'; $lang->stakeholder->progress = '达成进展'; -$lang->stakeholder->viewExpect = '期望信息'; $lang->stakeholder->issue = '问题管理'; $lang->stakeholder->userIssue = '干系人问题列表'; $lang->stakeholder->deleted = '已删除'; From 6614ca00ffb435bde7be867adab914f93368e07b Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 16:20:23 +0800 Subject: [PATCH 245/347] - Delete the privilege of gitlab-bindProduct. --- db/zentao.sql | 2 -- module/gitlab/control.php | 14 -------------- module/gitlab/lang/de.php | 1 - module/gitlab/lang/en.php | 1 - module/gitlab/lang/fr.php | 1 - module/gitlab/lang/zh-cn.php | 1 - module/group/lang/resource.php | 1 - 7 files changed, 21 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 7c2d38a8c5..4134d18a4e 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2331,7 +2331,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'git','apiSync'), (1,'git','cat'), (1,'git','diff'), -(1,'gitlab','bindProduct'), (1,'gitlab','bindUser'), (1,'gitlab','browse'), (1,'gitlab','create'), @@ -5280,7 +5279,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'git','apiSync'), (8,'git','cat'), (8,'git','diff'), -(8,'gitlab','bindProduct'), (8,'gitlab','bindUser'), (8,'gitlab','browse'), (8,'gitlab','create'), diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 33cfacfc41..a1d10ab6cb 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -196,20 +196,6 @@ class gitlab extends control $this->display(); } - /** - * Bind product and gitlab projects. - * - * @param int $gitlabID - * @access public - * @return void - */ - public function bindProduct($gitlabID) - { - $this->view->projectPairs = $this->gitlab->getProjectPairs($gitlabID); - $this->view->title = $this->lang->gitlab->bindProduct; - $this->display(); - } - /** * Delete a gitlab. * diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php index cf37e4bbec..1a336f263c 100644 --- a/module/gitlab/lang/de.php +++ b/module/gitlab/lang/de.php @@ -7,7 +7,6 @@ $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'View GitLab'; $lang->gitlab->bindUser = 'Bind User'; $lang->gitlab->webhook = 'Webhook'; -$lang->gitlab->bindProduct = "Import {$lang->productCommon}"; $lang->gitlab->importIssue = 'Import Issue'; $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index cf37e4bbec..1a336f263c 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -7,7 +7,6 @@ $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'View GitLab'; $lang->gitlab->bindUser = 'Bind User'; $lang->gitlab->webhook = 'Webhook'; -$lang->gitlab->bindProduct = "Import {$lang->productCommon}"; $lang->gitlab->importIssue = 'Import Issue'; $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php index cf37e4bbec..1a336f263c 100644 --- a/module/gitlab/lang/fr.php +++ b/module/gitlab/lang/fr.php @@ -7,7 +7,6 @@ $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'View GitLab'; $lang->gitlab->bindUser = 'Bind User'; $lang->gitlab->webhook = 'Webhook'; -$lang->gitlab->bindProduct = "Import {$lang->productCommon}"; $lang->gitlab->importIssue = 'Import Issue'; $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index 8483edf40c..0f450893f6 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -7,7 +7,6 @@ $lang->gitlab->edit = '编辑GitLab'; $lang->gitlab->view = '查看GitLab'; $lang->gitlab->bindUser = '绑定用户'; $lang->gitlab->webhook = 'Webhook'; -$lang->gitlab->bindProduct = "关联{$lang->productCommon}"; $lang->gitlab->importIssue = '关联issue'; $lang->gitlab->delete = '删除GitLab'; $lang->gitlab->confirmDelete = '确认删除该GitLab吗?'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 5dc349bc6f..c4b560b351 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1469,7 +1469,6 @@ $lang->resource->gitlab->view = 'view'; $lang->resource->gitlab->importIssue = 'importIssue'; $lang->resource->gitlab->delete = 'delete'; $lang->resource->gitlab->bindUser = 'bindUser'; -$lang->resource->gitlab->bindProduct = 'bindProduct'; $lang->resource->gitlab->browseProject = 'browseProject'; $lang->resource->gitlab->createProject = 'createProject'; $lang->resource->gitlab->editProject = 'editProject'; From 1eb6b5ac1c8e3fdddce2da8147621b4c6112d872 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 16:22:52 +0800 Subject: [PATCH 246/347] - Delete the privilege of dev-translate. --- db/zentao.sql | 1 - module/dev/control.php | 14 -------------- module/dev/lang/de.php | 2 -- module/dev/lang/en.php | 2 -- module/dev/lang/fr.php | 2 -- module/dev/lang/zh-cn.php | 2 -- module/dev/view/translate.html.php | 20 -------------------- module/group/lang/resource.php | 2 -- 8 files changed, 45 deletions(-) delete mode 100644 module/dev/view/translate.html.php diff --git a/db/zentao.sql b/db/zentao.sql index 4134d18a4e..e5c12601f3 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2243,7 +2243,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'dev','api'), (1,'dev','db'), (1,'dev','editor'), -(1,'dev','translate'), (1,'doc','allLibs'), (1,'doc','mySpace'), (1,'doc','myView'), diff --git a/module/dev/control.php b/module/dev/control.php index 3ca357f9d3..e16e7d8777 100644 --- a/module/dev/control.php +++ b/module/dev/control.php @@ -96,20 +96,6 @@ class dev extends control $this->display(); } - /** - * Translate. - * - * @access public - * @return void - */ - public function translate() - { - $this->view->title = $this->lang->dev->translate; - $this->view->position[] = $this->lang->dev->translate; - - $this->display(); - } - /** * Custom menu lang item. * diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php index b55fcf0103..96308e2225 100644 --- a/module/dev/lang/de.php +++ b/module/dev/lang/de.php @@ -3,7 +3,6 @@ $lang->dev->common = 'Entwicklung'; $lang->dev->api = 'API Document'; $lang->dev->db = 'Data Dictionary'; $lang->dev->editor = 'Bearbeiter'; -$lang->dev->translate = 'Translate'; $lang->dev->dbList = 'Datenbank'; $lang->dev->moduleList = 'Module'; $lang->dev->params = 'Parameter'; @@ -19,7 +18,6 @@ $lang->dev->paramDate = 'Date format: YY-mm-dd, e.g 2019-01-01'; $lang->dev->paramColor = 'Color format: #RGB, e.g. #3da7f5'; $lang->dev->paramMailto = "User account. Separate accounts by ','."; $lang->dev->noteEditor = "The editor is disabled for security reasons. To use this feature, Please turn on."; -$lang->dev->noteTranslate = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of translation."; $lang->dev->confirmRestore = 'Do you want to reset?'; $lang->dev->apiTips = 'Every page can be called through the JSON interface'; diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php index 56b0bbffe8..b7dfd2f88b 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -3,7 +3,6 @@ $lang->dev->common = 'Develop'; $lang->dev->api = 'API Document'; $lang->dev->db = 'Data Dictionary'; $lang->dev->editor = 'Editor'; -$lang->dev->translate = 'Translate'; $lang->dev->dbList = 'Database'; $lang->dev->moduleList = 'Modules'; $lang->dev->params = 'Parameters'; @@ -19,7 +18,6 @@ $lang->dev->paramDate = 'Date format: YY-mm-dd, e.g 2019-01-01'; $lang->dev->paramColor = 'Color format: #RGB, e.g. #3da7f5'; $lang->dev->paramMailto = "User account. Separate accounts by ','."; $lang->dev->noteEditor = "The editor is disabled for security reasons. To use this feature, Please turn on."; -$lang->dev->noteTranslate = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of translation."; $lang->dev->confirmRestore = 'Do you want to reset?'; $lang->dev->apiTips = 'Every page can be called through the JSON interface'; diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php index 56b0bbffe8..b7dfd2f88b 100644 --- a/module/dev/lang/fr.php +++ b/module/dev/lang/fr.php @@ -3,7 +3,6 @@ $lang->dev->common = 'Develop'; $lang->dev->api = 'API Document'; $lang->dev->db = 'Data Dictionary'; $lang->dev->editor = 'Editor'; -$lang->dev->translate = 'Translate'; $lang->dev->dbList = 'Database'; $lang->dev->moduleList = 'Modules'; $lang->dev->params = 'Parameters'; @@ -19,7 +18,6 @@ $lang->dev->paramDate = 'Date format: YY-mm-dd, e.g 2019-01-01'; $lang->dev->paramColor = 'Color format: #RGB, e.g. #3da7f5'; $lang->dev->paramMailto = "User account. Separate accounts by ','."; $lang->dev->noteEditor = "The editor is disabled for security reasons. To use this feature, Please turn on."; -$lang->dev->noteTranslate = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of translation."; $lang->dev->confirmRestore = 'Do you want to reset?'; $lang->dev->apiTips = 'Every page can be called through the JSON interface'; diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php index 1cfe5dfd1b..5f5f5cd9f8 100644 --- a/module/dev/lang/zh-cn.php +++ b/module/dev/lang/zh-cn.php @@ -3,7 +3,6 @@ $lang->dev->common = '二次开发'; $lang->dev->api = '接口文档'; $lang->dev->db = '数据字典'; $lang->dev->editor = '编辑器'; -$lang->dev->translate = '翻译'; $lang->dev->dbList = '数据库'; $lang->dev->moduleList = '模块列表'; $lang->dev->params = '参数列表'; @@ -19,7 +18,6 @@ $lang->dev->paramDate = '日期格式:YY-mm-dd,如:2019-01-01'; $lang->dev->paramColor = '颜色格式:#RGB,如:#3da7f5'; $lang->dev->paramMailto = "填写帐号,多个账号用','分隔。"; $lang->dev->noteEditor = "编辑器功能存在部分安全问题,如需使用该功能,可在此开启。"; -$lang->dev->noteTranslate = "翻译功能因为安全原因被禁用。使用该功能,请到官网下载安装 翻译 插件。"; $lang->dev->confirmRestore = '是否要恢复默认?'; $lang->dev->apiTips = '可访问的每个页面都可通过JSON接口调取'; diff --git a/module/dev/view/translate.html.php b/module/dev/view/translate.html.php deleted file mode 100644 index 49b26fb375..0000000000 --- a/module/dev/view/translate.html.php +++ /dev/null @@ -1,20 +0,0 @@ - - * @package dev - * @version $Id$ - * @link http://www.zentao.net - */ -?> - - -
-
dev->noteTranslate;?>
-
- diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index c4b560b351..8fcbe2e22b 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -2008,11 +2008,9 @@ $lang->cron->methodOrder[35] = 'openProcess'; $lang->resource->dev = new stdclass(); $lang->resource->dev->api = 'api'; $lang->resource->dev->db = 'db'; -$lang->resource->dev->translate = 'translate'; $lang->dev->methodOrder[5] = 'api'; $lang->dev->methodOrder[10] = 'db'; -$lang->dev->methodOrder[15] = 'translate'; $lang->resource->editor = new stdclass(); $lang->resource->editor->index = 'index'; From ebbc3402f921469236e12900aefbc51d5c454051 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 16:27:03 +0800 Subject: [PATCH 247/347] - Delete the privilege of stakeholder-issue. --- db/zentao.sql | 7 ------- module/group/lang/resource.php | 2 -- module/stakeholder/control.php | 20 -------------------- module/stakeholder/lang/de.php | 1 - module/stakeholder/lang/en.php | 1 - module/stakeholder/lang/fr.php | 1 - module/stakeholder/lang/zh-cn.php | 1 - 7 files changed, 33 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index e5c12601f3..32c1ab91f8 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2569,7 +2569,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'stakeholder','delete'), (1,'stakeholder','edit'), (1,'stakeholder','expect'), -(1,'stakeholder','issue'), (1,'stakeholder','plan'), (1,'stakeholder','userIssue'), (1,'stakeholder','view'), @@ -3737,7 +3736,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'stakeholder','delete'), (4,'stakeholder','edit'), (4,'stakeholder','expect'), -(4,'stakeholder','issue'), (4,'stakeholder','plan'), (4,'stakeholder','userIssue'), (4,'stakeholder','view'), @@ -4247,7 +4245,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'stakeholder','delete'), (5,'stakeholder','edit'), (5,'stakeholder','expect'), -(5,'stakeholder','issue'), (5,'stakeholder','plan'), (5,'stakeholder','userIssue'), (5,'stakeholder','view'), @@ -4652,7 +4649,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'stakeholder','browse'), (6,'stakeholder','communicate'), (6,'stakeholder','expect'), -(6,'stakeholder','issue'), (6,'stakeholder','userIssue'), (6,'stakeholder','view'), (6,'story','batchToTask'), @@ -5035,7 +5031,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'stakeholder','delete'), (7,'stakeholder','edit'), (7,'stakeholder','expect'), -(7,'stakeholder','issue'), (7,'stakeholder','userIssue'), (7,'stakeholder','view'), (7,'story','activate'), @@ -5790,7 +5785,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'stakeholder','delete'), (9,'stakeholder','edit'), (9,'stakeholder','expect'), -(9,'stakeholder','issue'), (9,'stakeholder','plan'), (9,'stakeholder','userIssue'), (9,'stakeholder','view'), @@ -6296,7 +6290,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (11,'stakeholder','browse'), (11,'stakeholder','communicate'), (11,'stakeholder','expect'), -(11,'stakeholder','issue'), (11,'stakeholder','userIssue'), (11,'stakeholder','view'), (11,'story','bugs'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 8fcbe2e22b..53a12a12e8 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -329,7 +329,6 @@ $lang->resource->stakeholder->batchCreate = 'batchCreate'; $lang->resource->stakeholder->edit = 'edit'; $lang->resource->stakeholder->delete = 'delete'; $lang->resource->stakeholder->view = 'viewAction'; -$lang->resource->stakeholder->issue = 'issue'; $lang->resource->stakeholder->communicate = 'communicate'; $lang->resource->stakeholder->expect = 'expect'; $lang->resource->stakeholder->userIssue = 'userIssue'; @@ -340,7 +339,6 @@ $lang->stakeholder->methodOrder[13] = 'batchCreate'; $lang->stakeholder->methodOrder[15] = 'edit'; $lang->stakeholder->methodOrder[25] = 'delete'; $lang->stakeholder->methodOrder[30] = 'view'; -$lang->stakeholder->methodOrder[35] = 'issue'; $lang->stakeholder->methodOrder[45] = 'communicate'; $lang->stakeholder->methodOrder[50] = 'expect'; $lang->stakeholder->methodOrder[80] = 'userIssue'; diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php index f2e3950bad..b3400044e0 100644 --- a/module/stakeholder/control.php +++ b/module/stakeholder/control.php @@ -367,26 +367,6 @@ class stakeholder extends control $this->display(); } - /** - * Stakeholder issues. - * - * @access public - * @return void - */ - public function issue() - { - $this->loadModel('issue'); - - if(common::hasPriv('issue', 'create')) $this->lang->TRActions = html::a($this->createLink('issue', 'create', 'from=stakeholder'), " " . $this->lang->issue->create, '', "class='btn btn-primary'"); - - $this->view->title = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->issue; - $this->view->position[] = $this->lang->stakeholder->issue; - - $this->view->users = $this->loadModel('company')->getCompanyUserPairs(); - $this->view->issues = $this->stakeholder->getIssues(); - $this->display(); - } - /** * Add communication record. * diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php index b048c21255..3a68481b18 100644 --- a/module/stakeholder/lang/de.php +++ b/module/stakeholder/lang/de.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->issue = 'Issue Management'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; $lang->stakeholder->deleted = 'Deleted'; diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php index 8d57b47f9c..5270372c38 100644 --- a/module/stakeholder/lang/en.php +++ b/module/stakeholder/lang/en.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->issue = 'Issue Management'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; $lang->stakeholder->deleted = 'Deleted'; diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php index b048c21255..3a68481b18 100644 --- a/module/stakeholder/lang/fr.php +++ b/module/stakeholder/lang/fr.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = 'Create'; $lang->stakeholder->communicate = 'Communications'; $lang->stakeholder->expect = 'Expectation'; $lang->stakeholder->progress = 'Progress'; -$lang->stakeholder->issue = 'Issue Management'; $lang->stakeholder->userIssue = 'Stakeholder Issues'; $lang->stakeholder->deleted = 'Deleted'; diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php index 245ad03dad..954419d463 100644 --- a/module/stakeholder/lang/zh-cn.php +++ b/module/stakeholder/lang/zh-cn.php @@ -17,7 +17,6 @@ $lang->stakeholder->add = '新建'; $lang->stakeholder->communicate = '沟通记录'; $lang->stakeholder->expect = '期望内容'; $lang->stakeholder->progress = '达成进展'; -$lang->stakeholder->issue = '问题管理'; $lang->stakeholder->userIssue = '干系人问题列表'; $lang->stakeholder->deleted = '已删除'; From 1dbffc836c7875c0c2adf94740ecb96d61c0ec2b Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 16:39:37 +0800 Subject: [PATCH 248/347] - Delete the privilege of feedback-batchChangeModule. --- db/updatebizinstall.sql | 3 --- 1 file changed, 3 deletions(-) diff --git a/db/updatebizinstall.sql b/db/updatebizinstall.sql index 910436c012..288e8953c5 100644 --- a/db/updatebizinstall.sql +++ b/db/updatebizinstall.sql @@ -647,7 +647,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'feedback','adminView'), (1,'feedback','assignTo'), (1,'feedback','batchAssignTo'), -(1,'feedback','batchChangeModule'), (1,'feedback','batchClose'), (1,'feedback','batchEdit'), (1,'feedback','batchReview'), @@ -1004,7 +1003,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'feedback','adminView'), (4,'feedback','assignTo'), (4,'feedback','batchAssignTo'), -(4,'feedback','batchChangeModule'), (4,'feedback','batchClose'), (4,'feedback','batchEdit'), (4,'feedback','batchReview'), @@ -1135,7 +1133,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'feedback','adminView'), (5,'feedback','assignTo'), (5,'feedback','batchAssignTo'), -(5,'feedback','batchChangeModule'), (5,'feedback','batchClose'), (5,'feedback','batchEdit'), (5,'feedback','batchReview'), From 11036fff26bf661d8dd903a4a62142d87a4c1b0f Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 16:51:13 +0800 Subject: [PATCH 249/347] - Delete the privilege of baseline-articleview. --- db/updatemaxinstall.sql | 9 --------- db/zentao.sql | 9 --------- 2 files changed, 18 deletions(-) diff --git a/db/updatemaxinstall.sql b/db/updatemaxinstall.sql index f6af48d4cd..3c5cee127f 100644 --- a/db/updatemaxinstall.sql +++ b/db/updatemaxinstall.sql @@ -975,7 +975,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'auditresult','showimport'), (1,'auditresult','unlink'), (1,'auditresult','view'), -(1,'baseline','articleview'), (1,'baseline','catalog'), (1,'baseline','createTemplate'), (1,'baseline','delete'), @@ -1489,7 +1488,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'auditresult','showimport'), (2,'auditresult','unlink'), (2,'auditresult','view'), -(2,'baseline','articleview'), (2,'baseline','catalog'), (2,'baseline','createTemplate'), (2,'baseline','editBook'), @@ -1784,7 +1782,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'auditresult','showimport'), (3,'auditresult','unlink'), (3,'auditresult','view'), -(3,'baseline','articleview'), (3,'baseline','catalog'), (3,'baseline','createTemplate'), (3,'baseline','editBook'), @@ -2011,7 +2008,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'auditresult','showimport'), (4,'auditresult','unlink'), (4,'auditresult','view'), -(4,'baseline','articleview'), (4,'baseline','catalog'), (4,'baseline','createTemplate'), (4,'baseline','editBook'), @@ -2341,7 +2337,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'auditresult','showimport'), (5,'auditresult','unlink'), (5,'auditresult','view'), -(5,'baseline','articleview'), (5,'baseline','catalog'), (5,'baseline','createTemplate'), (5,'baseline','editBook'), @@ -2622,7 +2617,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'auditresult','showimport'), (6,'auditresult','unlink'), (6,'auditresult','view'), -(6,'baseline','articleview'), (6,'baseline','catalog'), (6,'baseline','createTemplate'), (6,'baseline','editBook'), @@ -2889,7 +2883,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'auditresult','showimport'), (7,'auditresult','unlink'), (7,'auditresult','view'), -(7,'baseline','articleview'), (7,'baseline','catalog'), (7,'baseline','createTemplate'), (7,'baseline','editBook'), @@ -3168,7 +3161,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'auditresult','showimport'), (8,'auditresult','unlink'), (8,'auditresult','view'), -(8,'baseline','articleview'), (8,'baseline','catalog'), (8,'baseline','createTemplate'), (8,'baseline','editBook'), @@ -3516,7 +3508,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'auditresult','showimport'), (9,'auditresult','unlink'), (9,'auditresult','view'), -(9,'baseline','articleview'), (9,'baseline','catalog'), (9,'baseline','createTemplate'), (9,'baseline','delete'), diff --git a/db/zentao.sql b/db/zentao.sql index 32c1ab91f8..e5c2744ea1 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -10178,7 +10178,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'auditresult','showimport'), (1,'auditresult','unlink'), (1,'auditresult','view'), -(1,'baseline','articleview'), (1,'baseline','catalog'), (1,'baseline','createTemplate'), (1,'baseline','delete'), @@ -10692,7 +10691,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'auditresult','showimport'), (2,'auditresult','unlink'), (2,'auditresult','view'), -(2,'baseline','articleview'), (2,'baseline','catalog'), (2,'baseline','createTemplate'), (2,'baseline','editBook'), @@ -10987,7 +10985,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'auditresult','showimport'), (3,'auditresult','unlink'), (3,'auditresult','view'), -(3,'baseline','articleview'), (3,'baseline','catalog'), (3,'baseline','createTemplate'), (3,'baseline','editBook'), @@ -11214,7 +11211,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'auditresult','showimport'), (4,'auditresult','unlink'), (4,'auditresult','view'), -(4,'baseline','articleview'), (4,'baseline','catalog'), (4,'baseline','createTemplate'), (4,'baseline','editBook'), @@ -11544,7 +11540,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'auditresult','showimport'), (5,'auditresult','unlink'), (5,'auditresult','view'), -(5,'baseline','articleview'), (5,'baseline','catalog'), (5,'baseline','createTemplate'), (5,'baseline','editBook'), @@ -11825,7 +11820,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'auditresult','showimport'), (6,'auditresult','unlink'), (6,'auditresult','view'), -(6,'baseline','articleview'), (6,'baseline','catalog'), (6,'baseline','createTemplate'), (6,'baseline','editBook'), @@ -12092,7 +12086,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'auditresult','showimport'), (7,'auditresult','unlink'), (7,'auditresult','view'), -(7,'baseline','articleview'), (7,'baseline','catalog'), (7,'baseline','createTemplate'), (7,'baseline','editBook'), @@ -12371,7 +12364,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'auditresult','showimport'), (8,'auditresult','unlink'), (8,'auditresult','view'), -(8,'baseline','articleview'), (8,'baseline','catalog'), (8,'baseline','createTemplate'), (8,'baseline','editBook'), @@ -12719,7 +12711,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'auditresult','showimport'), (9,'auditresult','unlink'), (9,'auditresult','view'), -(9,'baseline','articleview'), (9,'baseline','catalog'), (9,'baseline','createTemplate'), (9,'baseline','delete'), From c95c02362e4c70bfb29cbebb4132a993dcfc317f Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 17:02:32 +0800 Subject: [PATCH 250/347] * Rename the privilege of my-todo. --- module/group/lang/resource.php | 2 +- module/my/lang/de.php | 1 + module/my/lang/en.php | 1 + module/my/lang/fr.php | 1 + module/my/lang/zh-cn.php | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 53a12a12e8..c449c63d20 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -91,7 +91,7 @@ $lang->index->methodOrder[0] = 'index'; /* My module. */ $lang->resource->my = new stdclass(); $lang->resource->my->index = 'indexAction'; -$lang->resource->my->todo = 'todo'; +$lang->resource->my->todo = 'todoAction'; $lang->resource->my->calendar = 'calendarAction'; $lang->resource->my->work = 'workAction'; $lang->resource->my->audit = 'audit'; diff --git a/module/my/lang/de.php b/module/my/lang/de.php index 8128ea67b4..6ee1daac4c 100644 --- a/module/my/lang/de.php +++ b/module/my/lang/de.php @@ -5,6 +5,7 @@ global $config; $lang->my->index = 'Home'; $lang->my->data = 'My Data'; $lang->my->todo = 'My Todos'; +$lang->my->todoAction = 'Schedule List'; $lang->my->calendar = 'Schedule'; $lang->my->work = 'Work'; $lang->my->contribute = 'Contribute'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 8128ea67b4..6ee1daac4c 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -5,6 +5,7 @@ global $config; $lang->my->index = 'Home'; $lang->my->data = 'My Data'; $lang->my->todo = 'My Todos'; +$lang->my->todoAction = 'Schedule List'; $lang->my->calendar = 'Schedule'; $lang->my->work = 'Work'; $lang->my->contribute = 'Contribute'; diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php index b1f198f1a0..65f036683e 100644 --- a/module/my/lang/fr.php +++ b/module/my/lang/fr.php @@ -5,6 +5,7 @@ global $config; $lang->my->index = 'Home'; $lang->my->data = 'My Data'; $lang->my->todo = 'My Todos'; +$lang->my->todoAction = 'Schedule List'; $lang->my->calendar = 'Schedule'; $lang->my->work = 'Work'; $lang->my->contribute = 'Contribute'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index fae7d997bb..f7bd31960a 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -5,6 +5,7 @@ global $config; $lang->my->index = '首页'; $lang->my->data = '我的数据'; $lang->my->todo = '我的待办'; +$lang->my->todoAction = '日程列表'; $lang->my->calendar = '日程'; $lang->my->work = '待处理'; $lang->my->contribute = '贡献'; From c632ffb32535005eb14d3f76f1ee2788beba98f9 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 17:11:19 +0800 Subject: [PATCH 251/347] - Delete the privilege of reviewsetting-reviewer. --- db/updatemaxinstall.sql | 9 --------- db/zentao.sql | 9 --------- 2 files changed, 18 deletions(-) diff --git a/db/updatemaxinstall.sql b/db/updatemaxinstall.sql index 3c5cee127f..eff72b968a 100644 --- a/db/updatemaxinstall.sql +++ b/db/updatemaxinstall.sql @@ -1286,7 +1286,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'reviewissue','resolved'), (1,'reviewissue','updateStatus'), (1,'reviewissue','view'), -(1,'reviewsetting','reviewer'), (1,'reviewsetting','version'), (1,'risk','activate'), (1,'risk','assignTo'), @@ -1640,7 +1639,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'reviewissue','resolved'), (2,'reviewissue','updateStatus'), (2,'reviewissue','view'), -(2,'reviewsetting','reviewer'), (2,'reviewsetting','version'), (2,'risk','activate'), (2,'risk','browse'), @@ -1921,7 +1919,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'reviewissue','resolved'), (3,'reviewissue','updateStatus'), (3,'reviewissue','view'), -(3,'reviewsetting','reviewer'), (3,'reviewsetting','version'), (3,'risk','activate'), (3,'risk','browse'), @@ -2190,7 +2187,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'reviewissue','resolved'), (4,'reviewissue','updateStatus'), (4,'reviewissue','view'), -(4,'reviewsetting','reviewer'), (4,'reviewsetting','version'), (4,'risk','activate'), (4,'risk','assignTo'), @@ -2516,7 +2512,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'reviewissue','resolved'), (5,'reviewissue','updateStatus'), (5,'reviewissue','view'), -(5,'reviewsetting','reviewer'), (5,'reviewsetting','version'), (5,'risk','activate'), (5,'risk','assignTo'), @@ -2779,7 +2774,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'reviewissue','resolved'), (6,'reviewissue','updateStatus'), (6,'reviewissue','view'), -(6,'reviewsetting','reviewer'), (6,'reviewsetting','version'), (6,'risk','activate'), (6,'risk','assignTo'), @@ -3062,7 +3056,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'reviewissue','resolved'), (7,'reviewissue','updateStatus'), (7,'reviewissue','view'), -(7,'reviewsetting','reviewer'), (7,'reviewsetting','version'), (7,'risk','activate'), (7,'risk','assignTo'), @@ -3320,7 +3313,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'reviewissue','resolved'), (8,'reviewissue','updateStatus'), (8,'reviewissue','view'), -(8,'reviewsetting','reviewer'), (8,'reviewsetting','version'), (8,'risk','activate'), (8,'risk','assignTo'), @@ -3666,7 +3658,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'reviewissue','resolved'), (9,'reviewissue','updateStatus'), (9,'reviewissue','view'), -(9,'reviewsetting','reviewer'), (9,'reviewsetting','version'), (9,'risk','activate'), (9,'risk','assignTo'), diff --git a/db/zentao.sql b/db/zentao.sql index e5c2744ea1..1f5fd0ea06 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -10489,7 +10489,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'reviewissue','resolved'), (1,'reviewissue','updateStatus'), (1,'reviewissue','view'), -(1,'reviewsetting','reviewer'), (1,'reviewsetting','version'), (1,'risk','activate'), (1,'risk','assignTo'), @@ -10843,7 +10842,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (2,'reviewissue','resolved'), (2,'reviewissue','updateStatus'), (2,'reviewissue','view'), -(2,'reviewsetting','reviewer'), (2,'reviewsetting','version'), (2,'risk','activate'), (2,'risk','browse'), @@ -11124,7 +11122,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (3,'reviewissue','resolved'), (3,'reviewissue','updateStatus'), (3,'reviewissue','view'), -(3,'reviewsetting','reviewer'), (3,'reviewsetting','version'), (3,'risk','activate'), (3,'risk','browse'), @@ -11393,7 +11390,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'reviewissue','resolved'), (4,'reviewissue','updateStatus'), (4,'reviewissue','view'), -(4,'reviewsetting','reviewer'), (4,'reviewsetting','version'), (4,'risk','activate'), (4,'risk','assignTo'), @@ -11719,7 +11715,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'reviewissue','resolved'), (5,'reviewissue','updateStatus'), (5,'reviewissue','view'), -(5,'reviewsetting','reviewer'), (5,'reviewsetting','version'), (5,'risk','activate'), (5,'risk','assignTo'), @@ -11982,7 +11977,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6,'reviewissue','resolved'), (6,'reviewissue','updateStatus'), (6,'reviewissue','view'), -(6,'reviewsetting','reviewer'), (6,'reviewsetting','version'), (6,'risk','activate'), (6,'risk','assignTo'), @@ -12265,7 +12259,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'reviewissue','resolved'), (7,'reviewissue','updateStatus'), (7,'reviewissue','view'), -(7,'reviewsetting','reviewer'), (7,'reviewsetting','version'), (7,'risk','activate'), (7,'risk','assignTo'), @@ -12523,7 +12516,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'reviewissue','resolved'), (8,'reviewissue','updateStatus'), (8,'reviewissue','view'), -(8,'reviewsetting','reviewer'), (8,'reviewsetting','version'), (8,'risk','activate'), (8,'risk','assignTo'), @@ -12869,7 +12861,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (9,'reviewissue','resolved'), (9,'reviewissue','updateStatus'), (9,'reviewissue','view'), -(9,'reviewsetting','reviewer'), (9,'reviewsetting','version'), (9,'risk','activate'), (9,'risk','assignTo'), From 66770f07c24046f460ad3c869b3a2e1537481a74 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 17:12:53 +0800 Subject: [PATCH 252/347] * Rename the privilege of product-project. --- module/product/lang/de.php | 2 +- module/product/lang/en.php | 2 +- module/product/lang/fr.php | 2 +- module/product/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/product/lang/de.php b/module/product/lang/de.php index e2a9143524..eff2e068c5 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -59,7 +59,7 @@ $lang->product->cases = 'Fälle'; $lang->product->builds = 'Builds'; $lang->product->roadmap = 'Roadmap'; $lang->product->doc = 'Dok'; -$lang->product->project = $lang->executionCommon . 'Liste'; +$lang->product->project = $lang->projectCommon . 'Liste'; $lang->product->moreProduct = "More {$lang->productCommon}"; $lang->product->projectInfo = "My {$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below."; $lang->product->progress = "Progress"; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index d2df457321..5f0368fa17 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -59,7 +59,7 @@ $lang->product->cases = 'Case'; $lang->product->builds = 'Build'; $lang->product->roadmap = "{$lang->productCommon} Roadmap"; $lang->product->doc = "{$lang->productCommon} Documents"; -$lang->product->project = $lang->executionCommon . ' List'; +$lang->product->project = $lang->projectCommon . ' List'; $lang->product->build = 'Build List'; $lang->product->moreProduct = "More {$lang->productCommon}"; $lang->product->projectInfo = "My {$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below."; diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php index 4918c58c04..0e7cf40daf 100644 --- a/module/product/lang/fr.php +++ b/module/product/lang/fr.php @@ -59,7 +59,7 @@ $lang->product->cases = 'CasTests'; $lang->product->builds = 'Build'; $lang->product->roadmap = "Roadmap {$lang->productCommon}"; $lang->product->doc = "Documents {$lang->productCommon}"; -$lang->product->project = ' Liste ' . $lang->executionCommon; +$lang->product->project = ' Liste ' . $lang->projectCommon; $lang->product->moreProduct = "More {$lang->productCommon}"; $lang->product->projectInfo = "My {$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below."; $lang->product->progress = "Progress"; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 3fdd89cfae..dc00fde58f 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -59,7 +59,7 @@ $lang->product->cases = '用例数'; $lang->product->builds = '版本数'; $lang->product->roadmap = "{$lang->productCommon}路线图"; $lang->product->doc = '文档列表'; -$lang->product->project = $lang->executionCommon . '列表'; +$lang->product->project = $lang->projectCommon . '列表'; $lang->product->moreProduct = "更多{$lang->productCommon}"; $lang->product->projectInfo = "所有与此{$lang->productCommon}关联的我参与的{$lang->projectCommon}"; $lang->product->progress = "{$lang->productCommon}完成度"; From 1a57384ff87e33054e351306da56b151f778061e Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 17:14:59 +0800 Subject: [PATCH 253/347] * Rename the privilege of productplan-browse. --- module/productplan/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php index c8a03e6487..ffa2df1b23 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->productplan->common = $lang->productCommon . '计划'; -$lang->productplan->browse = "浏览计划"; +$lang->productplan->browse = "计划列表"; $lang->productplan->index = "计划列表"; $lang->productplan->create = "创建计划"; $lang->productplan->edit = "编辑计划"; From a80f128df836c2797a363ef50132777f6d6ef0ad Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 17:25:13 +0800 Subject: [PATCH 254/347] * Rename the privilege of release-browse. --- module/release/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php index 47712f13d8..0b53fbfb32 100644 --- a/module/release/lang/zh-cn.php +++ b/module/release/lang/zh-cn.php @@ -16,7 +16,7 @@ $lang->release->linkBug = "关联Bug"; $lang->release->delete = "删除发布"; $lang->release->deleted = '已删除'; $lang->release->view = "发布详情"; -$lang->release->browse = "浏览发布"; +$lang->release->browse = "发布列表"; $lang->release->changeStatus = "修改状态"; $lang->release->batchUnlink = "批量移除"; $lang->release->batchUnlinkStory = "批量移除{$lang->SRCommon}"; From 951096c7b814fb416aa4af3bb73b07b538246250 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 17:26:05 +0800 Subject: [PATCH 255/347] - Delete the privilege of measurement-initCrontabQueue, because it belongs to admin. --- db/updatemaxinstall.sql | 3 --- db/zentao.sql | 3 --- 2 files changed, 6 deletions(-) diff --git a/db/updatemaxinstall.sql b/db/updatemaxinstall.sql index eff72b968a..d04f1690eb 100644 --- a/db/updatemaxinstall.sql +++ b/db/updatemaxinstall.sql @@ -1132,7 +1132,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'measurement','editDerivation'), (1,'measurement','editTemplate'), (1,'measurement','execCrontabQueue'), -(1,'measurement','initCrontabQueue'), (1,'measurement','searchMeas'), (1,'measurement','setSQL'), (1,'measurement','settips'), @@ -2386,7 +2385,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'measurement','editDerivation'), (5,'measurement','editTemplate'), (5,'measurement','execCrontabQueue'), -(5,'measurement','initCrontabQueue'), (5,'measurement','searchMeas'), (5,'measurement','template'), (5,'measurement','viewTemplate'), @@ -2942,7 +2940,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'measurement','editDerivation'), (7,'measurement','editTemplate'), (7,'measurement','execCrontabQueue'), -(7,'measurement','initCrontabQueue'), (7,'measurement','searchMeas'), (7,'measurement','template'), (7,'measurement','viewTemplate'), diff --git a/db/zentao.sql b/db/zentao.sql index 1f5fd0ea06..e5a844b667 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -10335,7 +10335,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'measurement','editDerivation'), (1,'measurement','editTemplate'), (1,'measurement','execCrontabQueue'), -(1,'measurement','initCrontabQueue'), (1,'measurement','searchMeas'), (1,'measurement','setSQL'), (1,'measurement','settips'), @@ -11589,7 +11588,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'measurement','editDerivation'), (5,'measurement','editTemplate'), (5,'measurement','execCrontabQueue'), -(5,'measurement','initCrontabQueue'), (5,'measurement','searchMeas'), (5,'measurement','template'), (5,'measurement','viewTemplate'), @@ -12145,7 +12143,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'measurement','editDerivation'), (7,'measurement','editTemplate'), (7,'measurement','execCrontabQueue'), -(7,'measurement','initCrontabQueue'), (7,'measurement','searchMeas'), (7,'measurement','template'), (7,'measurement','viewTemplate'), From 69c7b0080d12880e2daf333e692de6b1fd1b340f Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 17:29:10 +0800 Subject: [PATCH 256/347] - Delete the privilege of measurement-execCrontabQueue, because it belongs to admin. --- db/updatemaxinstall.sql | 3 --- db/zentao.sql | 3 --- 2 files changed, 6 deletions(-) diff --git a/db/updatemaxinstall.sql b/db/updatemaxinstall.sql index d04f1690eb..9f1dda0038 100644 --- a/db/updatemaxinstall.sql +++ b/db/updatemaxinstall.sql @@ -1131,7 +1131,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'measurement','editBasic'), (1,'measurement','editDerivation'), (1,'measurement','editTemplate'), -(1,'measurement','execCrontabQueue'), (1,'measurement','searchMeas'), (1,'measurement','setSQL'), (1,'measurement','settips'), @@ -2384,7 +2383,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'measurement','editBasic'), (5,'measurement','editDerivation'), (5,'measurement','editTemplate'), -(5,'measurement','execCrontabQueue'), (5,'measurement','searchMeas'), (5,'measurement','template'), (5,'measurement','viewTemplate'), @@ -2939,7 +2937,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'measurement','editBasic'), (7,'measurement','editDerivation'), (7,'measurement','editTemplate'), -(7,'measurement','execCrontabQueue'), (7,'measurement','searchMeas'), (7,'measurement','template'), (7,'measurement','viewTemplate'), diff --git a/db/zentao.sql b/db/zentao.sql index e5a844b667..ca5bc2c186 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -10334,7 +10334,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'measurement','editBasic'), (1,'measurement','editDerivation'), (1,'measurement','editTemplate'), -(1,'measurement','execCrontabQueue'), (1,'measurement','searchMeas'), (1,'measurement','setSQL'), (1,'measurement','settips'), @@ -11587,7 +11586,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5,'measurement','editBasic'), (5,'measurement','editDerivation'), (5,'measurement','editTemplate'), -(5,'measurement','execCrontabQueue'), (5,'measurement','searchMeas'), (5,'measurement','template'), (5,'measurement','viewTemplate'), @@ -12142,7 +12140,6 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7,'measurement','editBasic'), (7,'measurement','editDerivation'), (7,'measurement','editTemplate'), -(7,'measurement','execCrontabQueue'), (7,'measurement','searchMeas'), (7,'measurement','template'), (7,'measurement','viewTemplate'), From 514dce3314fcae09f8b049453426b43c5cbd2c39 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 17:29:31 +0800 Subject: [PATCH 257/347] * Rename the privilege of project-kanban. --- module/project/lang/de.php | 2 +- module/project/lang/en.php | 2 +- module/project/lang/fr.php | 2 +- module/project/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/project/lang/de.php b/module/project/lang/de.php index b2434531a8..b40a9d0e2c 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -175,7 +175,7 @@ $lang->project->product = $lang->productCommon; $lang->project->branch = 'Platform/Branch'; $lang->project->plan = 'Plan'; $lang->project->createKanban = 'Create Kanban'; -$lang->project->kanban = 'Kanban'; +$lang->project->kanban = 'Project Kanban'; /* Project Kanban. */ $lang->project->projectTypeList = array(); diff --git a/module/project/lang/en.php b/module/project/lang/en.php index b2434531a8..b40a9d0e2c 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -175,7 +175,7 @@ $lang->project->product = $lang->productCommon; $lang->project->branch = 'Platform/Branch'; $lang->project->plan = 'Plan'; $lang->project->createKanban = 'Create Kanban'; -$lang->project->kanban = 'Kanban'; +$lang->project->kanban = 'Project Kanban'; /* Project Kanban. */ $lang->project->projectTypeList = array(); diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index b2434531a8..b40a9d0e2c 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -175,7 +175,7 @@ $lang->project->product = $lang->productCommon; $lang->project->branch = 'Platform/Branch'; $lang->project->plan = 'Plan'; $lang->project->createKanban = 'Create Kanban'; -$lang->project->kanban = 'Kanban'; +$lang->project->kanban = 'Project Kanban'; /* Project Kanban. */ $lang->project->projectTypeList = array(); diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index cfa297cab8..c591b721fa 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -175,7 +175,7 @@ $lang->project->product = "所属{$lang->productCommon}"; $lang->project->branch = '平台/分支'; $lang->project->plan = '所属计划'; $lang->project->createKanban = '添加看板'; -$lang->project->kanban = '看板'; +$lang->project->kanban = '项目看板'; /* Project Kanban. */ $lang->project->projectTypeList = array(); From 1ed01d01692c907ea1bd70a38d0cba0265946df1 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Apr 2023 17:30:59 +0800 Subject: [PATCH 258/347] * Rename the privilege of project-group. --- module/project/lang/de.php | 2 +- module/project/lang/en.php | 2 +- module/project/lang/fr.php | 2 +- module/project/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/project/lang/de.php b/module/project/lang/de.php index b40a9d0e2c..5bf68b10e9 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -16,7 +16,7 @@ $lang->project->suspend = 'Suspend'; $lang->project->delete = 'Delete'; $lang->project->close = 'Close'; $lang->project->activate = 'Activate'; -$lang->project->group = 'Privilege Group'; +$lang->project->group = 'Privilege List'; $lang->project->createGroup = 'Create Group'; $lang->project->editGroup = 'Edit Group'; $lang->project->copyGroup = 'Copy Group'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index b40a9d0e2c..5bf68b10e9 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -16,7 +16,7 @@ $lang->project->suspend = 'Suspend'; $lang->project->delete = 'Delete'; $lang->project->close = 'Close'; $lang->project->activate = 'Activate'; -$lang->project->group = 'Privilege Group'; +$lang->project->group = 'Privilege List'; $lang->project->createGroup = 'Create Group'; $lang->project->editGroup = 'Edit Group'; $lang->project->copyGroup = 'Copy Group'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index b40a9d0e2c..5bf68b10e9 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -16,7 +16,7 @@ $lang->project->suspend = 'Suspend'; $lang->project->delete = 'Delete'; $lang->project->close = 'Close'; $lang->project->activate = 'Activate'; -$lang->project->group = 'Privilege Group'; +$lang->project->group = 'Privilege List'; $lang->project->createGroup = 'Create Group'; $lang->project->editGroup = 'Edit Group'; $lang->project->copyGroup = 'Copy Group'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index c591b721fa..fd7a75d9c7 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -16,7 +16,7 @@ $lang->project->suspend = "挂起{$lang->projectCommon}"; $lang->project->delete = "删除{$lang->projectCommon}"; $lang->project->close = "关闭{$lang->projectCommon}"; $lang->project->activate = "激活{$lang->projectCommon}"; -$lang->project->group = "{$lang->projectCommon}权限分组"; +$lang->project->group = "{$lang->projectCommon}权限列表"; $lang->project->createGroup = "{$lang->projectCommon}创建分组"; $lang->project->editGroup = "{$lang->projectCommon}编辑分组"; $lang->project->copyGroup = "{$lang->projectCommon}复制分组"; From a2be8ce66296b46850683cf32a1fec0fff71babd Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 13 Apr 2023 17:48:39 +0800 Subject: [PATCH 259/347] - Delete the privilege of im-getChatUsers, im-getChatGroups, im-notifyMSG, im-sendNotification, im-sendChatMessage, client-checkUpgrade. --- .../extension/xuan/group/ext/lang/de/xuanxuan.php | 14 ++++---------- .../extension/xuan/group/ext/lang/en/xuanxuan.php | 14 ++++---------- .../extension/xuan/group/ext/lang/fr/xuanxuan.php | 14 ++++---------- .../xuan/group/ext/lang/zh-cn/xuanxuan.php | 14 ++++---------- 4 files changed, 16 insertions(+), 40 deletions(-) diff --git a/xuanxuan/extension/xuan/group/ext/lang/de/xuanxuan.php b/xuanxuan/extension/xuan/group/ext/lang/de/xuanxuan.php index 5b3ec49d83..a5772876ff 100644 --- a/xuanxuan/extension/xuan/group/ext/lang/de/xuanxuan.php +++ b/xuanxuan/extension/xuan/group/ext/lang/de/xuanxuan.php @@ -8,17 +8,11 @@ $lang->resource->setting->xuanxuan = 'xuanxuan'; $lang->setting->methodOrder[26] = 'xuanxuan'; $lang->resource->im = new stdclass(); -$lang->resource->im->getChatUsers = 'getChatUsers'; -$lang->resource->im->getChatGroups = 'getChatGroups'; -$lang->resource->im->notifyMSG = 'notifyMSG'; -$lang->resource->im->sendNotification = 'sendNotification'; -$lang->resource->im->sendChatMessage = 'sendChatMessage'; $lang->resource->im->downloadXxdPackage = 'downloadXXD'; $lang->resource->im->debug = 'debug'; $lang->resource->client = new stdclass(); -$lang->resource->client->browse = 'browse'; -$lang->resource->client->create = 'create'; -$lang->resource->client->edit = 'edit'; -$lang->resource->client->delete = 'delete'; -$lang->resource->client->checkUpgrade = 'checkUpgrade'; +$lang->resource->client->browse = 'browse'; +$lang->resource->client->create = 'create'; +$lang->resource->client->edit = 'edit'; +$lang->resource->client->delete = 'delete'; diff --git a/xuanxuan/extension/xuan/group/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/group/ext/lang/en/xuanxuan.php index 5b3ec49d83..a5772876ff 100644 --- a/xuanxuan/extension/xuan/group/ext/lang/en/xuanxuan.php +++ b/xuanxuan/extension/xuan/group/ext/lang/en/xuanxuan.php @@ -8,17 +8,11 @@ $lang->resource->setting->xuanxuan = 'xuanxuan'; $lang->setting->methodOrder[26] = 'xuanxuan'; $lang->resource->im = new stdclass(); -$lang->resource->im->getChatUsers = 'getChatUsers'; -$lang->resource->im->getChatGroups = 'getChatGroups'; -$lang->resource->im->notifyMSG = 'notifyMSG'; -$lang->resource->im->sendNotification = 'sendNotification'; -$lang->resource->im->sendChatMessage = 'sendChatMessage'; $lang->resource->im->downloadXxdPackage = 'downloadXXD'; $lang->resource->im->debug = 'debug'; $lang->resource->client = new stdclass(); -$lang->resource->client->browse = 'browse'; -$lang->resource->client->create = 'create'; -$lang->resource->client->edit = 'edit'; -$lang->resource->client->delete = 'delete'; -$lang->resource->client->checkUpgrade = 'checkUpgrade'; +$lang->resource->client->browse = 'browse'; +$lang->resource->client->create = 'create'; +$lang->resource->client->edit = 'edit'; +$lang->resource->client->delete = 'delete'; diff --git a/xuanxuan/extension/xuan/group/ext/lang/fr/xuanxuan.php b/xuanxuan/extension/xuan/group/ext/lang/fr/xuanxuan.php index 5b3ec49d83..a5772876ff 100644 --- a/xuanxuan/extension/xuan/group/ext/lang/fr/xuanxuan.php +++ b/xuanxuan/extension/xuan/group/ext/lang/fr/xuanxuan.php @@ -8,17 +8,11 @@ $lang->resource->setting->xuanxuan = 'xuanxuan'; $lang->setting->methodOrder[26] = 'xuanxuan'; $lang->resource->im = new stdclass(); -$lang->resource->im->getChatUsers = 'getChatUsers'; -$lang->resource->im->getChatGroups = 'getChatGroups'; -$lang->resource->im->notifyMSG = 'notifyMSG'; -$lang->resource->im->sendNotification = 'sendNotification'; -$lang->resource->im->sendChatMessage = 'sendChatMessage'; $lang->resource->im->downloadXxdPackage = 'downloadXXD'; $lang->resource->im->debug = 'debug'; $lang->resource->client = new stdclass(); -$lang->resource->client->browse = 'browse'; -$lang->resource->client->create = 'create'; -$lang->resource->client->edit = 'edit'; -$lang->resource->client->delete = 'delete'; -$lang->resource->client->checkUpgrade = 'checkUpgrade'; +$lang->resource->client->browse = 'browse'; +$lang->resource->client->create = 'create'; +$lang->resource->client->edit = 'edit'; +$lang->resource->client->delete = 'delete'; diff --git a/xuanxuan/extension/xuan/group/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/group/ext/lang/zh-cn/xuanxuan.php index 5b3ec49d83..a5772876ff 100644 --- a/xuanxuan/extension/xuan/group/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/extension/xuan/group/ext/lang/zh-cn/xuanxuan.php @@ -8,17 +8,11 @@ $lang->resource->setting->xuanxuan = 'xuanxuan'; $lang->setting->methodOrder[26] = 'xuanxuan'; $lang->resource->im = new stdclass(); -$lang->resource->im->getChatUsers = 'getChatUsers'; -$lang->resource->im->getChatGroups = 'getChatGroups'; -$lang->resource->im->notifyMSG = 'notifyMSG'; -$lang->resource->im->sendNotification = 'sendNotification'; -$lang->resource->im->sendChatMessage = 'sendChatMessage'; $lang->resource->im->downloadXxdPackage = 'downloadXXD'; $lang->resource->im->debug = 'debug'; $lang->resource->client = new stdclass(); -$lang->resource->client->browse = 'browse'; -$lang->resource->client->create = 'create'; -$lang->resource->client->edit = 'edit'; -$lang->resource->client->delete = 'delete'; -$lang->resource->client->checkUpgrade = 'checkUpgrade'; +$lang->resource->client->browse = 'browse'; +$lang->resource->client->create = 'create'; +$lang->resource->client->edit = 'edit'; +$lang->resource->client->delete = 'delete'; From b07328ac44b0e13a0cc290670a42d56c175f50f8 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 08:39:39 +0800 Subject: [PATCH 260/347] * Rename the privilege of project-unlinkMember. --- module/group/lang/resource.php | 2 +- module/project/lang/de.php | 1 + module/project/lang/en.php | 1 + module/project/lang/fr.php | 1 + module/project/lang/zh-cn.php | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index c449c63d20..123d24fab4 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -195,7 +195,7 @@ $lang->resource->project->execution = 'execution'; $lang->resource->project->export = 'export'; $lang->resource->project->updateOrder = 'updateOrder'; $lang->resource->project->team = 'teamAction'; -$lang->resource->project->unlinkMember = 'unlinkMember'; +$lang->resource->project->unlinkMember = 'unlinkMemberAction'; $lang->resource->project->programTitle = 'moduleOpen'; $lang->project->methodOrder[0] = 'index'; diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 5bf68b10e9..f5bd10dd6c 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -56,6 +56,7 @@ $lang->project->testreport = 'Test Report'; $lang->project->selectProgram = 'Program filtering'; $lang->project->teamMember = 'Team Member'; $lang->project->unlinkMember = 'Remove Member'; +$lang->project->unlinkMemberAction = 'Remove Team Member'; $lang->project->copyTeamTitle = "Select a {$lang->projectCommon} team to copy"; $lang->project->daysGreaterProject = "Days cannot be greater than days of {$lang->projectCommon}『%s』"; $lang->project->errorHours = 'Hours/Day cannot be greater than『24』'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 5bf68b10e9..f5bd10dd6c 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -56,6 +56,7 @@ $lang->project->testreport = 'Test Report'; $lang->project->selectProgram = 'Program filtering'; $lang->project->teamMember = 'Team Member'; $lang->project->unlinkMember = 'Remove Member'; +$lang->project->unlinkMemberAction = 'Remove Team Member'; $lang->project->copyTeamTitle = "Select a {$lang->projectCommon} team to copy"; $lang->project->daysGreaterProject = "Days cannot be greater than days of {$lang->projectCommon}『%s』"; $lang->project->errorHours = 'Hours/Day cannot be greater than『24』'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index 5bf68b10e9..f5bd10dd6c 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -56,6 +56,7 @@ $lang->project->testreport = 'Test Report'; $lang->project->selectProgram = 'Program filtering'; $lang->project->teamMember = 'Team Member'; $lang->project->unlinkMember = 'Remove Member'; +$lang->project->unlinkMemberAction = 'Remove Team Member'; $lang->project->copyTeamTitle = "Select a {$lang->projectCommon} team to copy"; $lang->project->daysGreaterProject = "Days cannot be greater than days of {$lang->projectCommon}『%s』"; $lang->project->errorHours = 'Hours/Day cannot be greater than『24』'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index fd7a75d9c7..5f103d4c79 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -56,6 +56,7 @@ $lang->project->testreport = '测试报告'; $lang->project->selectProgram = '项目集筛选'; $lang->project->teamMember = '团队成员'; $lang->project->unlinkMember = '移除成员'; +$lang->project->unlinkMemberAction = '移除团队成员'; $lang->project->copyTeamTitle = "选择一个{$lang->projectCommon}团队来复制"; $lang->project->daysGreaterProject = "可用工日不能大于{$lang->projectCommon}的可用工日『%s』"; $lang->project->errorHours = '可用工时/天不能大于『24』'; From 15459e365139bbc628928b5d2c6042be72db68b2 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 08:44:11 +0800 Subject: [PATCH 261/347] * Rename the privilege of project-moduleOpen. --- module/group/lang/resource.php | 2 +- module/project/lang/de.php | 1 + module/project/lang/en.php | 1 + module/project/lang/fr.php | 1 + module/project/lang/zh-cn.php | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 123d24fab4..975159f33b 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -196,7 +196,7 @@ $lang->resource->project->export = 'export'; $lang->resource->project->updateOrder = 'updateOrder'; $lang->resource->project->team = 'teamAction'; $lang->resource->project->unlinkMember = 'unlinkMemberAction'; -$lang->resource->project->programTitle = 'moduleOpen'; +$lang->resource->project->programTitle = 'moduleOpenAction'; $lang->project->methodOrder[0] = 'index'; $lang->project->methodOrder[5] = 'browse'; diff --git a/module/project/lang/de.php b/module/project/lang/de.php index f5bd10dd6c..9e62e78fda 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -28,6 +28,7 @@ $lang->project->addProduct = "Add {$lang->productCommon}"; $lang->project->manageGroupMember = 'Manage Group'; $lang->project->moduleSetting = 'List Settings'; $lang->project->moduleOpen = 'Program Name'; +$lang->project->moduleOpenAction = 'Program Name Settings'; $lang->project->dynamic = 'Dynamic'; $lang->project->execution = 'Execution'; $lang->project->bug = 'Bug List'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index f5bd10dd6c..9e62e78fda 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -28,6 +28,7 @@ $lang->project->addProduct = "Add {$lang->productCommon}"; $lang->project->manageGroupMember = 'Manage Group'; $lang->project->moduleSetting = 'List Settings'; $lang->project->moduleOpen = 'Program Name'; +$lang->project->moduleOpenAction = 'Program Name Settings'; $lang->project->dynamic = 'Dynamic'; $lang->project->execution = 'Execution'; $lang->project->bug = 'Bug List'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index f5bd10dd6c..9e62e78fda 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -28,6 +28,7 @@ $lang->project->addProduct = "Add {$lang->productCommon}"; $lang->project->manageGroupMember = 'Manage Group'; $lang->project->moduleSetting = 'List Settings'; $lang->project->moduleOpen = 'Program Name'; +$lang->project->moduleOpenAction = 'Program Name Settings'; $lang->project->dynamic = 'Dynamic'; $lang->project->execution = 'Execution'; $lang->project->bug = 'Bug List'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 5f103d4c79..a694149583 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -28,6 +28,7 @@ $lang->project->addProduct = "新建{$lang->productCommon}"; $lang->project->manageGroupMember = '维护分组用户'; $lang->project->moduleSetting = '列表设置'; $lang->project->moduleOpen = '显示项目集名'; +$lang->project->moduleOpenAction = '显示项目集名设置'; $lang->project->dynamic = '动态'; $lang->project->execution = '执行列表'; $lang->project->bug = 'Bug列表'; From 86c437c8d9d56467989bfe323f8664a07ae83b32 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 09:01:19 +0800 Subject: [PATCH 262/347] * Rename the privilege of design-browse. --- module/design/lang/de.php | 2 +- module/design/lang/en.php | 2 +- module/design/lang/fr.php | 2 +- module/design/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/design/lang/de.php b/module/design/lang/de.php index 1edb3e5b2e..2497426927 100644 --- a/module/design/lang/de.php +++ b/module/design/lang/de.php @@ -47,7 +47,7 @@ $lang->design->batchCreate = 'Batch Create'; $lang->design->edit = 'Edit'; $lang->design->delete = 'Delete'; $lang->design->view = 'View'; -$lang->design->browse = 'List'; +$lang->design->browse = 'Design List'; $lang->design->viewCommit = 'View Commit'; $lang->design->linkCommit = 'Link Commit'; $lang->design->unlinkCommit = 'Unlink Commit'; diff --git a/module/design/lang/en.php b/module/design/lang/en.php index f336569e2e..80fbd310e9 100644 --- a/module/design/lang/en.php +++ b/module/design/lang/en.php @@ -47,7 +47,7 @@ $lang->design->batchCreate = 'Batch Create'; $lang->design->edit = 'Change'; $lang->design->delete = 'Delete'; $lang->design->view = 'View'; -$lang->design->browse = 'List'; +$lang->design->browse = 'Design List'; $lang->design->viewCommit = 'View Commit'; $lang->design->linkCommit = 'Link Commit'; $lang->design->unlinkCommit = 'Unlink Commit'; diff --git a/module/design/lang/fr.php b/module/design/lang/fr.php index 3eea7032a8..1e7f6207dd 100644 --- a/module/design/lang/fr.php +++ b/module/design/lang/fr.php @@ -47,7 +47,7 @@ $lang->design->batchCreate = 'Batch Create'; $lang->design->edit = 'Edit'; $lang->design->delete = 'Delete'; $lang->design->view = 'View'; -$lang->design->browse = 'List'; +$lang->design->browse = 'Design List'; $lang->design->viewCommit = 'View Commit'; $lang->design->linkCommit = 'Link Commit'; $lang->design->unlinkCommit = 'Unlink Commit'; diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php index fe0158ee3f..f8528894b3 100644 --- a/module/design/lang/zh-cn.php +++ b/module/design/lang/zh-cn.php @@ -47,7 +47,7 @@ $lang->design->batchCreate = '批量创建'; $lang->design->edit = '变更'; $lang->design->delete = '删除'; $lang->design->view = '设计概况'; -$lang->design->browse = '浏览列表'; +$lang->design->browse = '设计列表'; $lang->design->viewCommit = '查看提交'; $lang->design->linkCommit = '关联提交'; $lang->design->unlinkCommit = '取消关联'; From c7d1e33df14e08256c832d8693996c481c891c03 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 09:03:42 +0800 Subject: [PATCH 263/347] * Rename the privilege of design-view. --- module/design/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php index f8528894b3..9bcf087353 100644 --- a/module/design/lang/zh-cn.php +++ b/module/design/lang/zh-cn.php @@ -46,7 +46,7 @@ $lang->design->create = '创建设计'; $lang->design->batchCreate = '批量创建'; $lang->design->edit = '变更'; $lang->design->delete = '删除'; -$lang->design->view = '设计概况'; +$lang->design->view = '设计详情'; $lang->design->browse = '设计列表'; $lang->design->viewCommit = '查看提交'; $lang->design->linkCommit = '关联提交'; From 6755a48299099a1d45102fb9622bd4e7a7a5209c Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 09:07:13 +0800 Subject: [PATCH 264/347] * Rename the privilege of testtask-cases. --- module/testtask/lang/de.php | 2 +- module/testtask/lang/en.php | 2 +- module/testtask/lang/fr.php | 2 +- module/testtask/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php index 5b7a904710..e0273b4b39 100644 --- a/module/testtask/lang/de.php +++ b/module/testtask/lang/de.php @@ -60,7 +60,7 @@ $lang->testtask->compile = 'Compile'; $lang->testtask->duration = 'Duration'; $lang->testtask->viewAction = "View Request"; -$lang->testtask->casesAction = 'View Case'; +$lang->testtask->casesAction = 'Browse Cases List'; $lang->testtask->activateAction = "Activate Request"; $lang->testtask->blockAction = "Block Request"; $lang->testtask->closeAction = "Close Request"; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 78c08ce758..1f6fda1f60 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -60,7 +60,7 @@ $lang->testtask->compile = 'Compile'; $lang->testtask->duration = 'Duration'; $lang->testtask->viewAction = "View Request"; -$lang->testtask->casesAction = 'View Case'; +$lang->testtask->casesAction = 'Browse Cases List'; $lang->testtask->activateAction = "Activate Request"; $lang->testtask->blockAction = "Block Request"; $lang->testtask->closeAction = "Close Request"; diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php index 43dc348c65..044326f4ee 100644 --- a/module/testtask/lang/fr.php +++ b/module/testtask/lang/fr.php @@ -60,7 +60,7 @@ $lang->testtask->compile = 'Compile'; $lang->testtask->duration = 'Duration'; $lang->testtask->viewAction = "View Request"; -$lang->testtask->casesAction = 'View Case'; +$lang->testtask->casesAction = 'Browse Cases List'; $lang->testtask->activateAction = "Activer Campagne"; $lang->testtask->blockAction = "Bloquer Campagne"; $lang->testtask->closeAction = "Clôturer Campagne"; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index cd2a96566f..36a1147325 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -60,7 +60,7 @@ $lang->testtask->compile = '构建'; $lang->testtask->duration = '持续时间'; $lang->testtask->viewAction = "测试单概况"; -$lang->testtask->casesAction = '查看用例'; +$lang->testtask->casesAction = '浏览用例列表'; $lang->testtask->activateAction = "激活测试单"; $lang->testtask->blockAction = "阻塞测试单"; $lang->testtask->closeAction = "关闭测试单"; From 48436270c7b399e83d4f100ef3391a845e10150f Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 09:10:32 +0800 Subject: [PATCH 265/347] * Rename the privilege of testtask-unitCases. --- module/testtask/lang/de.php | 2 +- module/testtask/lang/en.php | 2 +- module/testtask/lang/fr.php | 2 +- module/testtask/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php index e0273b4b39..64d2980176 100644 --- a/module/testtask/lang/de.php +++ b/module/testtask/lang/de.php @@ -16,7 +16,7 @@ $lang->testtask->delete = "Löschen"; $lang->testtask->importUnitResult = "Import Unit Result"; $lang->testtask->importUnit = "Import Unit Result"; //Fix bug custom required testtask. $lang->testtask->browseUnits = "Unit Test List"; -$lang->testtask->unitCases = "Unit Test Cases"; +$lang->testtask->unitCases = "Browse Unit Cases List"; $lang->testtask->view = "Übersicht"; $lang->testtask->edit = "Bearbeiten"; $lang->testtask->browse = "Testaufgaben"; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 1f6fda1f60..979ee97f18 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -16,7 +16,7 @@ $lang->testtask->delete = "Delete Request"; $lang->testtask->importUnitResult = "Import Unit Result"; $lang->testtask->importUnit = "Import Unit Result"; //Fix bug custom required testtask. $lang->testtask->browseUnits = "Unit Test List"; -$lang->testtask->unitCases = "Unit Test Cases"; +$lang->testtask->unitCases = "Browse Unit Cases List"; $lang->testtask->view = "Request Detail"; $lang->testtask->edit = "Edit Request"; $lang->testtask->browse = "Test Request"; diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php index 044326f4ee..49f5ebca35 100644 --- a/module/testtask/lang/fr.php +++ b/module/testtask/lang/fr.php @@ -16,7 +16,7 @@ $lang->testtask->delete = "Supprimer Campagne"; $lang->testtask->importUnitResult = "Import T.U. Résult"; $lang->testtask->importUnit = "Import Unit Result"; //Fix bug custom required testtask. $lang->testtask->browseUnits = "Liste des tests unitaires"; -$lang->testtask->unitCases = "Cas de test unitaires"; +$lang->testtask->unitCases = "Browse Unit Cases List"; $lang->testtask->view = "Détail Campagne"; $lang->testtask->edit = "Editer Campagne"; $lang->testtask->browse = "Tester Campagne"; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 36a1147325..cb9163b533 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -16,7 +16,7 @@ $lang->testtask->delete = "删除测试单"; $lang->testtask->importUnitResult = "导入单元测试结果"; $lang->testtask->importUnit = "导入单元测试"; //Fix bug custom required testtask. $lang->testtask->browseUnits = "单元测试列表"; -$lang->testtask->unitCases = "单元测试用例"; +$lang->testtask->unitCases = "浏览单元测试用例列表"; $lang->testtask->view = "概况"; $lang->testtask->edit = "编辑测试单"; $lang->testtask->browse = "测试单列表"; From b544a554d705784b25bbeb583cf67796c5e7fb62 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 09:39:44 +0800 Subject: [PATCH 266/347] * Fix bug of manage priv. --- module/group/css/managepriv.css | 12 ++++++------ module/group/js/managepriv.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index 06fb897684..7dc5ec24c5 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -2,7 +2,7 @@ #mainContainer {display: flex; gap: 16px; height: calc(100vh - 165px);} #mainContainer > .main {flex: 1 1 75%; overflow-y: auto; padding: 0px; border: 1px solid #FFF; box-sizing: content-box;} #mainContainer > .side {flex: 1 1 25%;} -#mainContainer .main .btn-group {position: absolute; visibility: hidden; top: 2px; display: inline-block;} +#mainContainer .main .btn-group {position: absolute; visibility: hidden; top: 2px; display: inline-block; z-index: 12;} .priv-panel {background: #fff; padding: 10px 16px; box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 5%);} .priv-panel {height: 40%;} .priv-panel .table-empty-tip {padding: calc(15% - 10px) 10px;} @@ -65,18 +65,18 @@ main#main {padding-bottom: 0px;} #privPackageList th.module {width: 112px; min-width: 112px; max-width: 112px; background-color: #EDEEF28C; font-weight: 600; padding-left: 20px; border-color: #FFF;} #privPackageList .module label {padding-left: 0; overflow: visible;} -#privPackageList td.package-column {padding: 10px 16px; background-color: #FFF;} +#privPackageList td.package-column {padding: 20px 16px; background-color: #FFF;} #privPackageList div.package {display: inline-block; width: calc(25% - 5px); padding: 10px 0;} #privPackageList .package + .package {padding: 0;} -#privPackageList .package .check-all {display: inline-block;} -#privPackageList .package input {margin-left: 0px; left: 0px;} +#privPackageList .package .check-all {display: inline-block; height: 20px;} +#privPackageList .package input {margin-left: 0px; left: 0px; height: 20px;} #privPackageList .package label {padding-left: 0; display: inline-block;} -#privPackageList .package .list-toggle {width: 20px; font-size: 14px; line-height: 22px; color: #cbd0db; text-align: center; cursor: pointer; -webkit-transition: all .2s; -o-transition: all .2s; transition: all .2s; vertical-align: top;} +#privPackageList .package .list-toggle {width: 20px; font-size: 14px; line-height: 20px; color: #cbd0db; text-align: center; cursor: pointer; -webkit-transition: all .2s; -o-transition: all .2s; transition: all .2s; vertical-align: top;} #privPackageList .package .list-toggle:before {content: "\f0da";} #privPackageList .package.open .list-toggle {transform: rotate(90deg);} #privPackageList .package.open .list-toggle:before {transform: rotate(90deg);} #privPackageList .group-item {display: inline-block; width: 158px; margin-bottom: 15px;} -#privPackageList .privs {padding: 20px 20px 0 20px; border: 1px solid #F5F6F8; background-color: #F9FAFB; position: relative; display: block; max-width: unset; box-shadow: unset; margin-top: 0px; z-index: 1;} +#privPackageList .privs {padding: 20px 20px 0 20px; margin: 10px 0px;border: 1px solid #F5F6F8; background-color: #F9FAFB; position: relative; display: block; max-width: unset; box-shadow: unset; margin-top: 0px; z-index: 1;} #privPackageList .popover .popover-content {display: inline-block; padding: 0;} #privPackageList .popover .arrow {border-bottom-color: #F5F6F8; top: -10px;} #privPackageList .popover .arrow:after {border-bottom-color: #F9FAFB;} diff --git a/module/group/js/managepriv.js b/module/group/js/managepriv.js index 24274acf22..514253d1bf 100644 --- a/module/group/js/managepriv.js +++ b/module/group/js/managepriv.js @@ -343,7 +343,7 @@ function recommendChange($item, checked) $actionItem.removeAttr('checked'); } var moduleName = $actionItem.closest('tr').find('.package').attr('data-module'); - var packageID = $actionItem.closest('tr').find('.package').attr('data-package'); + var packageID = $('#privList').length > 0 ? $actionItem.closest('tr').find('.package').attr('data-package') : $actionItem.closest('.privs').attr('data-package'); changeParentChecked($actionItem, moduleName, packageID); var $parentItem = $item.closest('ul').closest('li').find('input[data-has-children="true"]'); From 94726278e785b7c10bbe6485ff952102466be655 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 09:54:01 +0800 Subject: [PATCH 267/347] * Modify css of manage priv by package. --- module/group/css/managepriv.css | 4 ++-- module/group/js/managepriv.js | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index 7dc5ec24c5..a3723bfac0 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -2,7 +2,7 @@ #mainContainer {display: flex; gap: 16px; height: calc(100vh - 165px);} #mainContainer > .main {flex: 1 1 75%; overflow-y: auto; padding: 0px; border: 1px solid #FFF; box-sizing: content-box;} #mainContainer > .side {flex: 1 1 25%;} -#mainContainer .main .btn-group {position: absolute; visibility: hidden; top: 2px; display: inline-block; z-index: 12;} +#mainContainer .main .btn-group {position: absolute; visibility: hidden; top: 2px; display: inline-block; z-index: 2;} .priv-panel {background: #fff; padding: 10px 16px; box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 5%);} .priv-panel {height: 40%;} .priv-panel .table-empty-tip {padding: calc(15% - 10px) 10px;} @@ -76,7 +76,7 @@ main#main {padding-bottom: 0px;} #privPackageList .package.open .list-toggle {transform: rotate(90deg);} #privPackageList .package.open .list-toggle:before {transform: rotate(90deg);} #privPackageList .group-item {display: inline-block; width: 158px; margin-bottom: 15px;} -#privPackageList .privs {padding: 20px 20px 0 20px; margin: 10px 0px;border: 1px solid #F5F6F8; background-color: #F9FAFB; position: relative; display: block; max-width: unset; box-shadow: unset; margin-top: 0px; z-index: 1;} +#privPackageList .privs {padding: 20px 20px 0 20px; margin: 10px 0px;border: 1px solid #F5F6F8; background-color: #F9FAFB; position: relative; display: block; max-width: unset; box-shadow: unset; z-index: 1;} #privPackageList .popover .popover-content {display: inline-block; padding: 0;} #privPackageList .popover .arrow {border-bottom-color: #F5F6F8; top: -10px;} #privPackageList .popover .arrow:after {border-bottom-color: #F9FAFB;} diff --git a/module/group/js/managepriv.js b/module/group/js/managepriv.js index 514253d1bf..6f72aace18 100644 --- a/module/group/js/managepriv.js +++ b/module/group/js/managepriv.js @@ -439,9 +439,11 @@ $(function() if(!opened) { - $(this).closest('.package').addClass('open'); + $(this).closest('.package').addClass('open'); var moduleName = $(this).closest('.package').attr('data-module'); var packageID = $(this).closest('.package').attr('data-package'); + + /* The privs should be inserted after which permission package. */ var perRowPackages = Math.floor($(this).closest('td').width() / $(this).closest('td').find('.package').width()); var packageIndex = $(this).closest('.package').index() / 2 ; var appendIndex = (Math.floor(packageIndex / perRowPackages) + 1) * perRowPackages - 1; @@ -451,12 +453,20 @@ $(function() + $privs.html().replace(/actions/g, 'showPrivs') + '
'); + /* Calculate the triangle position of privs popover. */ var position = $(this).closest('td').find('.package').width() * (packageIndex % perRowPackages) + 30; $showPrivs.find('.arrow').css('left', position + 'px'); - if($(this).closest('td').find('.package').eq(appendIndex).length > 0) $(this).closest('td').find('.package').eq(appendIndex).after($showPrivs); - if($(this).closest('td').find('.package').eq(appendIndex).length == 0) $(this).closest('td').find('.package').eq(-1).after($showPrivs); + if($(this).closest('td').find('.package').eq(appendIndex).length == 0) + { + $(this).closest('td').find('.package').eq(-1).after($showPrivs); + $showPrivs.css('margin-bottom', '0'); + } + else + { + $(this).closest('td').find('.package').eq(appendIndex).after($showPrivs); + } } }); }); From 2e24b54e8c35870718f987a46b3a71946a285c36 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 10:02:29 +0800 Subject: [PATCH 268/347] * Rename the privilege of testsuite-delete. --- module/testsuite/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php index 1315d01298..485a95b3f9 100644 --- a/module/testsuite/lang/zh-cn.php +++ b/module/testsuite/lang/zh-cn.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->testsuite->create = "建套件"; -$lang->testsuite->delete = "删除"; +$lang->testsuite->delete = "删除套件"; $lang->testsuite->view = "概况"; $lang->testsuite->edit = "编辑套件"; $lang->testsuite->browse = "套件列表"; From 8d707b7cb551207891a3abec131875bfeead3f11 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 10:31:07 +0800 Subject: [PATCH 269/347] * Rename the privilege of dept-updateOrder. --- module/dept/lang/de.php | 2 +- module/dept/lang/en.php | 2 +- module/dept/lang/fr.php | 2 +- module/dept/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/dept/lang/de.php b/module/dept/lang/de.php index 5aa9a45c15..6d28053181 100644 --- a/module/dept/lang/de.php +++ b/module/dept/lang/de.php @@ -20,7 +20,7 @@ $lang->dept->manager = "Manager"; $lang->dept->name = "Name"; $lang->dept->browse = "Verwalten"; $lang->dept->manage = "Pflegen"; -$lang->dept->updateOrder = "Sortieren"; +$lang->dept->updateOrder = "Department Ranking"; $lang->dept->add = "Hinzufügen"; $lang->dept->grade = "Grade"; $lang->dept->order = "Rank"; diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index 51d714190c..61cca954f6 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -20,7 +20,7 @@ $lang->dept->manager = "Manager"; $lang->dept->name = "Department Name"; $lang->dept->browse = "Manage Department"; $lang->dept->manage = "Manage Department"; -$lang->dept->updateOrder = "Rank Department"; +$lang->dept->updateOrder = "Department Ranking"; $lang->dept->add = "Add Department"; $lang->dept->grade = "Department Grade"; $lang->dept->order = "Department Order"; diff --git a/module/dept/lang/fr.php b/module/dept/lang/fr.php index 4b75de3faf..5f8b377f42 100644 --- a/module/dept/lang/fr.php +++ b/module/dept/lang/fr.php @@ -20,7 +20,7 @@ $lang->dept->manager = "Responsable"; $lang->dept->name = "Nom du Compartiment"; $lang->dept->browse = "Consulter Compartiment"; $lang->dept->manage = "Gérer Compartiment"; -$lang->dept->updateOrder = "Rang Compartiment"; +$lang->dept->updateOrder = "Department Ranking"; $lang->dept->add = "Ajout Compartiment"; $lang->dept->grade = "Grade du Compartiment"; $lang->dept->order = "Ordre du Compartiment"; diff --git a/module/dept/lang/zh-cn.php b/module/dept/lang/zh-cn.php index ea92254f6e..bc3dca759f 100644 --- a/module/dept/lang/zh-cn.php +++ b/module/dept/lang/zh-cn.php @@ -20,7 +20,7 @@ $lang->dept->manager = "负责人"; $lang->dept->name = "部门名称"; $lang->dept->browse = "部门维护"; $lang->dept->manage = "维护部门"; -$lang->dept->updateOrder = "更新排序"; +$lang->dept->updateOrder = "部门排序"; $lang->dept->add = "添加部门"; $lang->dept->grade = "部门级别"; $lang->dept->order = "排序"; From 684e648e6175e5bc705c92dd652d78371b6822ef Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 10:40:36 +0800 Subject: [PATCH 270/347] * Rename the privilege of dept-manageChild. --- module/dept/lang/de.php | 2 ++ module/dept/lang/en.php | 2 ++ module/dept/lang/fr.php | 2 ++ module/dept/lang/zh-cn.php | 2 ++ module/group/lang/resource.php | 2 +- 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/module/dept/lang/de.php b/module/dept/lang/de.php index 6d28053181..820a509b96 100644 --- a/module/dept/lang/de.php +++ b/module/dept/lang/de.php @@ -27,6 +27,8 @@ $lang->dept->order = "Rank"; $lang->dept->dragAndSort = "Verschieben und sortieren"; $lang->dept->noDepartment = "No Department"; +$lang->dept->manageChildAction = "Manage Subordinate Department"; + $lang->dept->confirmDelete = " Möchten Sie diese Abteilung löschen?"; $lang->dept->successSave = " Gespeichert!"; $lang->dept->repeatDepart = " Es gibt einen doppelten Abteilungsnamen, möchten Sie ihn wirklich hinzufügen?"; diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index 61cca954f6..509053d751 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -27,6 +27,8 @@ $lang->dept->order = "Department Order"; $lang->dept->dragAndSort = "Drag to order"; $lang->dept->noDepartment = "No Department"; +$lang->dept->manageChildAction = "Manage Subordinate Department"; + $lang->dept->confirmDelete = " Do you want to delete this department?"; $lang->dept->successSave = " Saved!"; $lang->dept->repeatDepart = " There is a duplicate department name, are you sure to add it?"; diff --git a/module/dept/lang/fr.php b/module/dept/lang/fr.php index 5f8b377f42..7938dc0bc9 100644 --- a/module/dept/lang/fr.php +++ b/module/dept/lang/fr.php @@ -27,6 +27,8 @@ $lang->dept->order = "Ordre du Compartiment"; $lang->dept->dragAndSort = "Déplacez pour classer"; $lang->dept->noDepartment = "No Department"; +$lang->dept->manageChildAction = "Manage Subordinate Department"; + $lang->dept->confirmDelete = " Confirmez que vous voulez bien supprimer ce Compartiment ?"; $lang->dept->successSave = " Sauvé !"; $lang->dept->repeatDepart = " Il y a un nom de département en double, êtes-vous sûr de l'ajouter ?"; diff --git a/module/dept/lang/zh-cn.php b/module/dept/lang/zh-cn.php index bc3dca759f..b684592d51 100644 --- a/module/dept/lang/zh-cn.php +++ b/module/dept/lang/zh-cn.php @@ -27,6 +27,8 @@ $lang->dept->order = "排序"; $lang->dept->dragAndSort = "拖动排序"; $lang->dept->noDepartment = "无部门"; +$lang->dept->manageChildAction = "维护下级部门"; + $lang->dept->confirmDelete = " 您确定删除该部门吗?"; $lang->dept->successSave = " 修改成功。"; $lang->dept->repeatDepart = " 存在部门名称重复,您确认添加吗?"; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 975159f33b..e4a34e33c8 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1645,7 +1645,7 @@ $lang->company->methodOrder[25] = 'dynamic'; $lang->resource->dept = new stdclass(); $lang->resource->dept->browse = 'browse'; $lang->resource->dept->updateOrder = 'updateOrder'; -$lang->resource->dept->manageChild = 'manageChild'; +$lang->resource->dept->manageChild = 'manageChildAction'; $lang->resource->dept->edit = 'edit'; $lang->resource->dept->delete = 'delete'; From 82bb07fce281d724b547858e9783b86e6a162197 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 10:42:58 +0800 Subject: [PATCH 271/347] * Rename the privilege of group-browse. --- module/group/lang/de.php | 1 + module/group/lang/en.php | 1 + module/group/lang/fr.php | 1 + module/group/lang/resource.php | 2 +- module/group/lang/zh-cn.php | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 5e98615877..3dbe87be46 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -11,6 +11,7 @@ */ $lang->group->common = 'Berechtigungen'; $lang->group->browse = 'Gruppen Rechte'; +$lang->group->browseAction = 'Group List'; $lang->group->create = 'Gruppe hinzufügen'; $lang->group->edit = 'Bearbeiten'; $lang->group->copy = 'Kopieren'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index b9d240c269..ebd63df5aa 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -11,6 +11,7 @@ */ $lang->group->common = 'Privilege'; $lang->group->browse = 'Privilege Group'; +$lang->group->browseAction = 'Group List'; $lang->group->create = 'Create Group'; $lang->group->edit = 'Edit Group'; $lang->group->copy = 'Copy Group'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 3d41f2bb1c..3911267441 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -11,6 +11,7 @@ */ $lang->group->common = 'Privilège'; $lang->group->browse = 'Groupes de Privilèges'; +$lang->group->browseAction = 'Group List'; $lang->group->create = 'Créer un Groupe'; $lang->group->edit = 'Editer Groupe'; $lang->group->copy = 'Copier Groupe'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index e4a34e33c8..211a053947 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1657,7 +1657,7 @@ $lang->dept->methodOrder[25] = 'delete'; /* Group. */ $lang->resource->group = new stdclass(); -$lang->resource->group->browse = 'browse'; +$lang->resource->group->browse = 'browseAction'; $lang->resource->group->create = 'create'; $lang->resource->group->edit = 'edit'; $lang->resource->group->copy = 'copy'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index b0f4b6dbc9..9e1cf3cfdf 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -11,6 +11,7 @@ */ $lang->group->common = '权限分组'; $lang->group->browse = '浏览分组'; +$lang->group->browseAction = '分组列表'; $lang->group->create = '新增分组'; $lang->group->edit = '编辑分组'; $lang->group->copy = '复制分组'; From f229d4bc9158945d90c4eb67b0d82f6615e900da Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 10:51:47 +0800 Subject: [PATCH 272/347] * Rename the privilege of group-managePriv, group-managePrivByGroup. --- module/group/lang/de.php | 4 ++-- module/group/lang/en.php | 4 ++-- module/group/lang/fr.php | 4 ++-- module/group/lang/zh-cn.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 3dbe87be46..da64e6d502 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -17,8 +17,8 @@ $lang->group->edit = 'Bearbeiten'; $lang->group->copy = 'Kopieren'; $lang->group->delete = 'Löschen'; $lang->group->manageView = 'Anzeigen'; -$lang->group->managePriv = 'Mehrfachzuordnung'; -$lang->group->managePrivByGroup = 'Rechte'; +$lang->group->managePriv = 'Assign Privileges'; +$lang->group->managePrivByGroup = 'Assign Privileges by Group'; $lang->group->managePrivByModule = 'Modul Rechte'; $lang->group->byModuleTips = '(SHIFT/STRG für Multi-Select)'; $lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index ebd63df5aa..c3820bfce7 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -17,8 +17,8 @@ $lang->group->edit = 'Edit Group'; $lang->group->copy = 'Copy Group'; $lang->group->delete = 'Delete Group'; $lang->group->manageView = 'Manage Sight'; -$lang->group->managePriv = 'Manage Privileges'; -$lang->group->managePrivByGroup = 'Manage Privileges by Group'; +$lang->group->managePriv = 'Assign Privileges'; +$lang->group->managePrivByGroup = 'Assign Privileges by Group'; $lang->group->managePrivByModule = 'Manage Privileges by Module'; $lang->group->byModuleTips = '(Press Shift/Ctrl to Multi-select)'; $lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 3911267441..bb050d09b4 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -17,8 +17,8 @@ $lang->group->edit = 'Editer Groupe'; $lang->group->copy = 'Copier Groupe'; $lang->group->delete = 'Supprimer Groupe'; $lang->group->manageView = 'Gérer droits consultation'; -$lang->group->managePriv = 'Gérer Privilèges'; -$lang->group->managePrivByGroup = 'Gérer Privilèges par Groupe'; +$lang->group->managePriv = 'Assign Privileges'; +$lang->group->managePrivByGroup = 'Assign Privileges by Group'; $lang->group->managePrivByModule = 'Gérer Privilèges par Module'; $lang->group->byModuleTips = '(Shift/Ctrl pour sélection multiple)'; $lang->group->allTips = 'After checking this option, the administrator can manage all objects in the system, including objects created later.'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 9e1cf3cfdf..3d8d6f0337 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -17,8 +17,8 @@ $lang->group->edit = '编辑分组'; $lang->group->copy = '复制分组'; $lang->group->delete = '删除分组'; $lang->group->manageView = '视野维护'; -$lang->group->managePriv = '权限维护'; -$lang->group->managePrivByGroup = '权限维护'; +$lang->group->managePriv = '分配权限'; +$lang->group->managePrivByGroup = '分配权限'; $lang->group->managePrivByModule = '按模块分配权限'; $lang->group->byModuleTips = '(可以按住Shift或者Ctrl键进行多选)'; $lang->group->allTips = '勾选此项后,管理员可管理系统中所有对象,包括后续创建的对象。'; From 43c8fd2a6bf1fde2e0851a7b03fab64f0b11219c Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 10:53:38 +0800 Subject: [PATCH 273/347] * Rename the privilege of admin-safe. --- module/admin/lang/de.php | 2 +- module/admin/lang/en.php | 2 +- module/admin/lang/fr.php | 2 +- module/admin/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index f0d85ba9c5..db7f986962 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -12,7 +12,7 @@ $lang->admin->index = 'Admin Home'; $lang->admin->sso = 'SSO'; $lang->admin->ssoAction = 'Link Zdoo'; -$lang->admin->safeIndex = 'Sicherheit'; +$lang->admin->safeIndex = 'Password Security Setting'; $lang->admin->checkWeak = 'Schwache Passwörter prüfen'; $lang->admin->certifyMobile = 'Prüfen Sie die Mobilnummer'; $lang->admin->certifyEmail = 'Prüfen Sie die Emailadresse'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 897a0bb8ac..c9ac499fcf 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -12,7 +12,7 @@ $lang->admin->index = 'Admin Home'; $lang->admin->sso = 'Zdoo'; $lang->admin->ssoAction = 'Link Zdoo'; -$lang->admin->safeIndex = 'Security'; +$lang->admin->safeIndex = 'Password Security Setting'; $lang->admin->checkWeak = 'Check Weak Password'; $lang->admin->certifyMobile = 'Verify your cellphone'; $lang->admin->certifyEmail = 'Verify your Email'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index a21cd5788e..cdcc0941ae 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -12,7 +12,7 @@ $lang->admin->index = 'Admin Home'; $lang->admin->sso = 'Zdoo'; $lang->admin->ssoAction = 'Link Zdoo'; -$lang->admin->safeIndex = 'Sécurité'; +$lang->admin->safeIndex = 'Password Security Setting'; $lang->admin->checkWeak = 'Contrôle niveau de sécurité des mots de passe'; $lang->admin->certifyMobile = 'Vérifier votre smartphone'; $lang->admin->certifyEmail = 'Vérifier votre Email'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index fd330527f0..a1014bb979 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -12,7 +12,7 @@ $lang->admin->index = '后台管理首页'; $lang->admin->sso = 'ZDOO集成'; $lang->admin->ssoAction = 'ZDOO集成'; -$lang->admin->safeIndex = '安全'; +$lang->admin->safeIndex = '密码安全设置'; $lang->admin->checkWeak = '弱口令检查'; $lang->admin->certifyMobile = '认证手机'; $lang->admin->certifyEmail = '认证邮箱'; From 5ee474c83e7995c3500b3bef9e762d10a5c101d7 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 10:55:48 +0800 Subject: [PATCH 274/347] * Rename the privilege of action-trash. --- module/action/lang/de.php | 1 + module/action/lang/en.php | 1 + module/action/lang/fr.php | 1 + module/action/lang/zh-cn.php | 1 + module/group/lang/resource.php | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/module/action/lang/de.php b/module/action/lang/de.php index c6be1c329a..23a4f024c4 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -45,6 +45,7 @@ $lang->action->create = 'Kommentar hinzufügen'; $lang->action->comment = 'Kommentar'; $lang->action->byQuery = 'Search'; +$lang->action->trashAction = 'Recycle List'; $lang->action->undeleteAction = 'Reset Data'; $lang->action->hideOneAction = 'Hide Data'; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 242c2d29fa..8c39c4fd7e 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -45,6 +45,7 @@ $lang->action->create = 'Add Comment'; $lang->action->comment = 'Comment'; $lang->action->byQuery = 'Search'; +$lang->action->trashAction = 'Recycle List'; $lang->action->undeleteAction = 'Reset Data'; $lang->action->hideOneAction = 'Hide Data'; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index 179b7690c9..083775007d 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -45,6 +45,7 @@ $lang->action->create = 'Ajouter commentaire'; $lang->action->comment = 'Commentaire'; $lang->action->byQuery = 'Search'; +$lang->action->trashAction = 'Recycle List'; $lang->action->undeleteAction = 'Reset Data'; $lang->action->hideOneAction = 'Hide Data'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index b15a7e5891..ee9e8091e8 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -45,6 +45,7 @@ $lang->action->create = '添加备注'; $lang->action->comment = '备注'; $lang->action->byQuery = '搜索'; +$lang->action->trashAction = '回收站列表'; $lang->action->undeleteAction = '还原数据'; $lang->action->hideOneAction = '隐藏数据'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 211a053947..2666371c26 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1956,7 +1956,7 @@ $lang->holiday->methodOrder[20] = 'import'; /* Action. */ $lang->resource->action = new stdclass(); -$lang->resource->action->trash = 'trash'; +$lang->resource->action->trash = 'trashAction'; $lang->resource->action->undelete = 'undeleteAction'; $lang->resource->action->hideOne = 'hideOneAction'; $lang->resource->action->hideAll = 'hideAll'; From f450eea9000e6d54ce9786ae00392d6900b6a0ff Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 10:58:46 +0800 Subject: [PATCH 275/347] * Rename the privilege of svn-apiSync. --- module/svn/lang/de.php | 2 +- module/svn/lang/zh-cn.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/svn/lang/de.php b/module/svn/lang/de.php index 5d5bfffc71..a5bd0bacee 100644 --- a/module/svn/lang/de.php +++ b/module/svn/lang/de.php @@ -13,4 +13,4 @@ $lang->svn->common = 'Subversion'; $lang->svn->cat = 'Code anzeigen'; $lang->svn->diff = 'Diff Code'; -$lang->svn->apiSync = 'API: Sync svn Logs'; +$lang->svn->apiSync = 'API: Sync SVN Logs'; diff --git a/module/svn/lang/zh-cn.php b/module/svn/lang/zh-cn.php index 3469b72795..d4bb17c7a2 100644 --- a/module/svn/lang/zh-cn.php +++ b/module/svn/lang/zh-cn.php @@ -13,4 +13,4 @@ $lang->svn->common = 'Subversion'; $lang->svn->cat = '查看源代码'; $lang->svn->diff = '比较源代码'; -$lang->svn->apiSync = '接口:同步svn日志'; +$lang->svn->apiSync = '接口:同步SVN日志'; From 67d5a9672d00a268e89fb0a27d31bbb98a7f9c60 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 11:00:09 +0800 Subject: [PATCH 276/347] * Rename the privilege of git-apiSync. --- module/git/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/git/lang/zh-cn.php b/module/git/lang/zh-cn.php index 2b54f34e61..bd8d0371b5 100644 --- a/module/git/lang/zh-cn.php +++ b/module/git/lang/zh-cn.php @@ -13,4 +13,4 @@ $lang->git->common = 'Git'; $lang->git->cat = '查看源代码'; $lang->git->diff = '比较源代码'; -$lang->git->apiSync = '接口:同步git日志'; +$lang->git->apiSync = '接口:同步Git日志'; From 18c872134fc0f42983d6455535269babdb575a8d Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 11:01:23 +0800 Subject: [PATCH 277/347] * Rename the privilege of backup-index. --- module/backup/lang/de.php | 2 +- module/backup/lang/en.php | 2 +- module/backup/lang/fr.php | 2 +- module/backup/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/backup/lang/de.php b/module/backup/lang/de.php index 4b57e619bb..97ea82d55c 100644 --- a/module/backup/lang/de.php +++ b/module/backup/lang/de.php @@ -1,6 +1,6 @@ backup->common = 'Sicherung'; -$lang->backup->index = 'Start'; +$lang->backup->index = 'Backup List'; $lang->backup->history = 'Verlauf'; $lang->backup->delete = 'Löschen'; $lang->backup->backup = 'Sichern'; diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index 5a07230909..60ee44f2b5 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -1,6 +1,6 @@ backup->common = 'Backup'; -$lang->backup->index = 'Backup Home'; +$lang->backup->index = 'Backup List'; $lang->backup->history = 'History'; $lang->backup->delete = 'Delete Backup'; $lang->backup->backup = 'Backup'; diff --git a/module/backup/lang/fr.php b/module/backup/lang/fr.php index 9c46497f40..57870777ad 100644 --- a/module/backup/lang/fr.php +++ b/module/backup/lang/fr.php @@ -1,6 +1,6 @@ backup->common = 'Backup'; -$lang->backup->index = 'Accueil Backup'; +$lang->backup->index = 'Backup Home'; $lang->backup->history = 'Historique'; $lang->backup->delete = 'Suppression Backup'; $lang->backup->backup = 'Backup'; diff --git a/module/backup/lang/zh-cn.php b/module/backup/lang/zh-cn.php index e01eed81b3..7c5e505979 100644 --- a/module/backup/lang/zh-cn.php +++ b/module/backup/lang/zh-cn.php @@ -1,6 +1,6 @@ backup->common = '备份'; -$lang->backup->index = '备份首页'; +$lang->backup->index = '备份列表'; $lang->backup->history = '备份历史'; $lang->backup->delete = '删除备份'; $lang->backup->backup = '开始备份'; From f5ecaaa1224c0009544bab2bcf1043eae68502c5 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 11:02:32 +0800 Subject: [PATCH 278/347] * Rename the privilege of backup-restore. --- module/backup/lang/de.php | 2 +- module/backup/lang/en.php | 2 +- module/backup/lang/fr.php | 2 +- module/backup/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/backup/lang/de.php b/module/backup/lang/de.php index 97ea82d55c..84fd08d1db 100644 --- a/module/backup/lang/de.php +++ b/module/backup/lang/de.php @@ -4,7 +4,7 @@ $lang->backup->index = 'Backup List'; $lang->backup->history = 'Verlauf'; $lang->backup->delete = 'Löschen'; $lang->backup->backup = 'Sichern'; -$lang->backup->restore = 'Restore'; +$lang->backup->restore = 'Restore Backup'; $lang->backup->change = 'Ablaufdatum'; $lang->backup->changeAB = 'Bearbeiten'; $lang->backup->rmPHPHeader = 'Remove PHP header'; diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index 60ee44f2b5..f0a20e6e87 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -4,7 +4,7 @@ $lang->backup->index = 'Backup List'; $lang->backup->history = 'History'; $lang->backup->delete = 'Delete Backup'; $lang->backup->backup = 'Backup'; -$lang->backup->restore = 'Restore'; +$lang->backup->restore = 'Restore Backup'; $lang->backup->change = 'Edit Expiration'; $lang->backup->changeAB = 'Edit'; $lang->backup->rmPHPHeader = 'Remove PHP header'; diff --git a/module/backup/lang/fr.php b/module/backup/lang/fr.php index 57870777ad..84c9a1afad 100644 --- a/module/backup/lang/fr.php +++ b/module/backup/lang/fr.php @@ -4,7 +4,7 @@ $lang->backup->index = 'Backup Home'; $lang->backup->history = 'Historique'; $lang->backup->delete = 'Suppression Backup'; $lang->backup->backup = 'Backup'; -$lang->backup->restore = 'Restaurer'; +$lang->backup->restore = 'Restore Backup'; $lang->backup->change = 'Editer Expiration'; $lang->backup->changeAB = 'Editer'; $lang->backup->rmPHPHeader = 'Enlever PHP header'; diff --git a/module/backup/lang/zh-cn.php b/module/backup/lang/zh-cn.php index 7c5e505979..a9b7ccc00c 100644 --- a/module/backup/lang/zh-cn.php +++ b/module/backup/lang/zh-cn.php @@ -4,7 +4,7 @@ $lang->backup->index = '备份列表'; $lang->backup->history = '备份历史'; $lang->backup->delete = '删除备份'; $lang->backup->backup = '开始备份'; -$lang->backup->restore = '还原'; +$lang->backup->restore = '还原备份'; $lang->backup->change = '保留时间'; $lang->backup->changeAB = '修改'; $lang->backup->rmPHPHeader = '去除安全设置'; From 2b6539addcb76a2fe145421a40e51a96726d1635 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 11:05:54 +0800 Subject: [PATCH 279/347] * Rename the privilege of backup-restore. --- module/backup/lang/de.php | 3 ++- module/backup/lang/en.php | 3 ++- module/backup/lang/fr.php | 3 ++- module/backup/lang/zh-cn.php | 3 ++- module/group/lang/resource.php | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/module/backup/lang/de.php b/module/backup/lang/de.php index 84fd08d1db..c2a2ce191b 100644 --- a/module/backup/lang/de.php +++ b/module/backup/lang/de.php @@ -4,12 +4,13 @@ $lang->backup->index = 'Backup List'; $lang->backup->history = 'Verlauf'; $lang->backup->delete = 'Löschen'; $lang->backup->backup = 'Sichern'; -$lang->backup->restore = 'Restore Backup'; +$lang->backup->restore = 'Restore'; $lang->backup->change = 'Ablaufdatum'; $lang->backup->changeAB = 'Bearbeiten'; $lang->backup->rmPHPHeader = 'Remove PHP header'; $lang->backup->setting = 'Settings'; +$lang->backup->restoreAction = 'Restore Backup'; $lang->backup->settingAction = 'Backup Settings'; $lang->backup->time = 'Datum'; diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index f0a20e6e87..d703f1f914 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -4,12 +4,13 @@ $lang->backup->index = 'Backup List'; $lang->backup->history = 'History'; $lang->backup->delete = 'Delete Backup'; $lang->backup->backup = 'Backup'; -$lang->backup->restore = 'Restore Backup'; +$lang->backup->restore = 'Restore'; $lang->backup->change = 'Edit Expiration'; $lang->backup->changeAB = 'Edit'; $lang->backup->rmPHPHeader = 'Remove PHP header'; $lang->backup->setting = 'Settings'; +$lang->backup->restoreAction = 'Restore Backup'; $lang->backup->settingAction = 'Backup Settings'; $lang->backup->time = 'Date'; diff --git a/module/backup/lang/fr.php b/module/backup/lang/fr.php index 84c9a1afad..d0ad721292 100644 --- a/module/backup/lang/fr.php +++ b/module/backup/lang/fr.php @@ -4,12 +4,13 @@ $lang->backup->index = 'Backup Home'; $lang->backup->history = 'Historique'; $lang->backup->delete = 'Suppression Backup'; $lang->backup->backup = 'Backup'; -$lang->backup->restore = 'Restore Backup'; +$lang->backup->restore = 'Restore'; $lang->backup->change = 'Editer Expiration'; $lang->backup->changeAB = 'Editer'; $lang->backup->rmPHPHeader = 'Enlever PHP header'; $lang->backup->setting = 'Paramétrage'; +$lang->backup->restoreAction = 'Restore Backup'; $lang->backup->settingAction = 'Backup Settings'; $lang->backup->time = 'Date'; diff --git a/module/backup/lang/zh-cn.php b/module/backup/lang/zh-cn.php index a9b7ccc00c..b7d97bc832 100644 --- a/module/backup/lang/zh-cn.php +++ b/module/backup/lang/zh-cn.php @@ -4,12 +4,13 @@ $lang->backup->index = '备份列表'; $lang->backup->history = '备份历史'; $lang->backup->delete = '删除备份'; $lang->backup->backup = '开始备份'; -$lang->backup->restore = '还原备份'; +$lang->backup->restore = '还原'; $lang->backup->change = '保留时间'; $lang->backup->changeAB = '修改'; $lang->backup->rmPHPHeader = '去除安全设置'; $lang->backup->setting = '设置'; +$lang->backup->restoreAction = '还原备份'; $lang->backup->settingAction = '备份设置'; $lang->backup->time = '备份时间'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 2666371c26..18221effbf 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1973,7 +1973,7 @@ $lang->action->methodOrder[30] = 'editComment'; $lang->resource->backup = new stdclass(); $lang->resource->backup->index = 'index'; $lang->resource->backup->backup = 'backup'; -$lang->resource->backup->restore = 'restore'; +$lang->resource->backup->restore = 'restoreAction'; $lang->resource->backup->change = 'change'; $lang->resource->backup->delete = 'delete'; $lang->resource->backup->setting = 'settingAction'; From c57f4bee39d310cd8696125eb6a3fa06ee255055 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 11:07:01 +0800 Subject: [PATCH 280/347] * Rename the privilege of cron-index. --- module/cron/lang/de.php | 2 +- module/cron/lang/en.php | 2 +- module/cron/lang/fr.php | 2 +- module/cron/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/cron/lang/de.php b/module/cron/lang/de.php index 177e8dc81e..78721612ea 100644 --- a/module/cron/lang/de.php +++ b/module/cron/lang/de.php @@ -2,7 +2,7 @@ $lang->cron->common = 'Geplante Tasks'; $lang->cron->id = 'ID'; $lang->cron->buildin = 'Build In'; -$lang->cron->index = 'Home'; +$lang->cron->index = 'Geplante Tasks List'; $lang->cron->list = 'Tasks'; $lang->cron->create = 'Hinzufügen'; $lang->cron->createAction = 'Add Cron'; diff --git a/module/cron/lang/en.php b/module/cron/lang/en.php index 77712ef146..d326a16c81 100644 --- a/module/cron/lang/en.php +++ b/module/cron/lang/en.php @@ -2,7 +2,7 @@ $lang->cron->common = 'Cron'; $lang->cron->id = 'ID'; $lang->cron->buildin = 'Build In'; -$lang->cron->index = 'Cron Home'; +$lang->cron->index = 'Cron List'; $lang->cron->list = 'Task'; $lang->cron->create = 'Add'; $lang->cron->createAction = 'Add Cron'; diff --git a/module/cron/lang/fr.php b/module/cron/lang/fr.php index 0afc17f576..bc0f6060e4 100644 --- a/module/cron/lang/fr.php +++ b/module/cron/lang/fr.php @@ -2,7 +2,7 @@ $lang->cron->common = 'Cron'; $lang->cron->id = 'ID'; $lang->cron->buildin = 'Build In'; -$lang->cron->index = 'Accueil Cron'; +$lang->cron->index = 'Accueil Cron List'; $lang->cron->list = 'Tâches'; $lang->cron->create = 'Ajouter'; $lang->cron->createAction = 'Ajouter Cron'; diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php index b407a22114..7835d95dea 100644 --- a/module/cron/lang/zh-cn.php +++ b/module/cron/lang/zh-cn.php @@ -2,7 +2,7 @@ $lang->cron->common = '定时任务'; $lang->cron->id = '编号'; $lang->cron->buildin = '内置'; -$lang->cron->index = '首页'; +$lang->cron->index = '定时任务列表'; $lang->cron->list = '任务列表'; $lang->cron->create = '添加'; $lang->cron->createAction = '添加任务'; From 2a352ade87fb6163cec9835fd53e69bb9cb17d9c Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 13:43:56 +0800 Subject: [PATCH 281/347] * Rename the privilege of mr-browse. --- module/group/lang/resource.php | 2 +- module/mr/lang/de.php | 1 + module/mr/lang/en.php | 1 + module/mr/lang/fr.php | 1 + module/mr/lang/zh-cn.php | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 18221effbf..6883c65d02 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1581,7 +1581,7 @@ $lang->sonarqube->methodOrder[50] = 'browseIssue'; /* merge request. */ $lang->resource->mr = new stdclass(); $lang->resource->mr->create = 'create'; -$lang->resource->mr->browse = 'browse'; +$lang->resource->mr->browse = 'browseAction'; $lang->resource->mr->edit = 'edit'; $lang->resource->mr->delete = 'delete'; $lang->resource->mr->view = 'view'; diff --git a/module/mr/lang/de.php b/module/mr/lang/de.php index 2970661f04..63191a6b87 100644 --- a/module/mr/lang/de.php +++ b/module/mr/lang/de.php @@ -6,6 +6,7 @@ $lang->mr->view = "Survey"; $lang->mr->create = "Create"; $lang->mr->apiCreate = "Interface: Create"; $lang->mr->browse = "Browse"; +$lang->mr->browseAction = "{$lang->mr->common} List"; $lang->mr->list = "List"; $lang->mr->edit = "Edit"; $lang->mr->delete = "Delete"; diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index 2970661f04..63191a6b87 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -6,6 +6,7 @@ $lang->mr->view = "Survey"; $lang->mr->create = "Create"; $lang->mr->apiCreate = "Interface: Create"; $lang->mr->browse = "Browse"; +$lang->mr->browseAction = "{$lang->mr->common} List"; $lang->mr->list = "List"; $lang->mr->edit = "Edit"; $lang->mr->delete = "Delete"; diff --git a/module/mr/lang/fr.php b/module/mr/lang/fr.php index 2970661f04..63191a6b87 100644 --- a/module/mr/lang/fr.php +++ b/module/mr/lang/fr.php @@ -6,6 +6,7 @@ $lang->mr->view = "Survey"; $lang->mr->create = "Create"; $lang->mr->apiCreate = "Interface: Create"; $lang->mr->browse = "Browse"; +$lang->mr->browseAction = "{$lang->mr->common} List"; $lang->mr->list = "List"; $lang->mr->edit = "Edit"; $lang->mr->delete = "Delete"; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 3b45e1a2af..1af2d4367e 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -6,6 +6,7 @@ $lang->mr->view = "概况"; $lang->mr->create = "创建{$lang->mr->common}"; $lang->mr->apiCreate = "接口:创建{$lang->mr->common}"; $lang->mr->browse = "浏览{$lang->mr->common}"; +$lang->mr->browseAction = "{$lang->mr->common}列表"; $lang->mr->list = $lang->mr->browse; $lang->mr->edit = "编辑{$lang->mr->common}"; $lang->mr->delete = "删除{$lang->mr->common}"; From 4f9a284fb6531f2d5d1c42524daaf18a92a2a226 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 13:46:15 +0800 Subject: [PATCH 282/347] * Rename the privilege of mr-view. --- module/group/lang/resource.php | 2 +- module/mr/lang/de.php | 1 + module/mr/lang/en.php | 1 + module/mr/lang/fr.php | 1 + module/mr/lang/zh-cn.php | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 6883c65d02..33c0e21a93 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1584,7 +1584,7 @@ $lang->resource->mr->create = 'create'; $lang->resource->mr->browse = 'browseAction'; $lang->resource->mr->edit = 'edit'; $lang->resource->mr->delete = 'delete'; -$lang->resource->mr->view = 'view'; +$lang->resource->mr->view = 'viewAction'; $lang->resource->mr->accept = 'accept'; $lang->resource->mr->diff = 'viewDiff'; $lang->resource->mr->link = 'linkList'; diff --git a/module/mr/lang/de.php b/module/mr/lang/de.php index 63191a6b87..11192e05fc 100644 --- a/module/mr/lang/de.php +++ b/module/mr/lang/de.php @@ -3,6 +3,7 @@ $lang->mr = new stdclass; $lang->mr->common = "Merge Request"; $lang->mr->server = "Server"; $lang->mr->view = "Survey"; +$lang->mr->viewAction = "{$lang->mr->common} Details"; $lang->mr->create = "Create"; $lang->mr->apiCreate = "Interface: Create"; $lang->mr->browse = "Browse"; diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index 63191a6b87..11192e05fc 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -3,6 +3,7 @@ $lang->mr = new stdclass; $lang->mr->common = "Merge Request"; $lang->mr->server = "Server"; $lang->mr->view = "Survey"; +$lang->mr->viewAction = "{$lang->mr->common} Details"; $lang->mr->create = "Create"; $lang->mr->apiCreate = "Interface: Create"; $lang->mr->browse = "Browse"; diff --git a/module/mr/lang/fr.php b/module/mr/lang/fr.php index 63191a6b87..11192e05fc 100644 --- a/module/mr/lang/fr.php +++ b/module/mr/lang/fr.php @@ -3,6 +3,7 @@ $lang->mr = new stdclass; $lang->mr->common = "Merge Request"; $lang->mr->server = "Server"; $lang->mr->view = "Survey"; +$lang->mr->viewAction = "{$lang->mr->common} Details"; $lang->mr->create = "Create"; $lang->mr->apiCreate = "Interface: Create"; $lang->mr->browse = "Browse"; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 1af2d4367e..a6ae9db172 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -3,6 +3,7 @@ $lang->mr = new stdclass; $lang->mr->common = "合并请求"; $lang->mr->server = "服务器"; $lang->mr->view = "概况"; +$lang->mr->viewAction = "{$lang->mr->common}详情"; $lang->mr->create = "创建{$lang->mr->common}"; $lang->mr->apiCreate = "接口:创建{$lang->mr->common}"; $lang->mr->browse = "浏览{$lang->mr->common}"; From 219894ff1bb6759fa7a577cd220834b1651e9e03 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 13:55:20 +0800 Subject: [PATCH 283/347] * Modify module width from 112px to 142px for manage priv by package. --- module/group/css/managepriv.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index a3723bfac0..eb5f89cf0a 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -63,7 +63,7 @@ main#main {padding-bottom: 0px;} .side .priv-panel {padding: 16px;} -#privPackageList th.module {width: 112px; min-width: 112px; max-width: 112px; background-color: #EDEEF28C; font-weight: 600; padding-left: 20px; border-color: #FFF;} +#privPackageList th.module {width: 142px; min-width: 142px; max-width: 142px; background-color: #EDEEF28C; font-weight: 600; padding-left: 20px; border-color: #FFF;} #privPackageList .module label {padding-left: 0; overflow: visible;} #privPackageList td.package-column {padding: 20px 16px; background-color: #FFF;} #privPackageList div.package {display: inline-block; width: calc(25% - 5px); padding: 10px 0;} From a402f0bdf9bf67be629fb65af82175b2cc2e39a4 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:16:23 +0800 Subject: [PATCH 284/347] * Fix bug after merge code. --- module/group/view/privbygroup.html.php | 1 - module/group/view/privbypackage.html.php | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 2496056610..fcf739f3b1 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -76,7 +76,6 @@
-<<<<<<< HEAD
diff --git a/module/group/view/privbypackage.html.php b/module/group/view/privbypackage.html.php index 7d984d51f8..afc25b7ed0 100644 --- a/module/group/view/privbypackage.html.php +++ b/module/group/view/privbypackage.html.php @@ -103,7 +103,9 @@
> - + $moduleName->common;?> + $moduleName->manage;?> +
From e1a2d13b6889478abe6f2a8d1358d4ec620005fb Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:42:20 +0800 Subject: [PATCH 285/347] * Rename the privilege of job-browse. --- module/job/lang/de.php | 2 +- module/job/lang/en.php | 2 +- module/job/lang/fr.php | 2 +- module/job/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/job/lang/de.php b/module/job/lang/de.php index db048f7d0e..e2b8d05de7 100644 --- a/module/job/lang/de.php +++ b/module/job/lang/de.php @@ -12,7 +12,7 @@ $lang->job->dirChange = 'Directory Changed'; $lang->job->buildTag = 'Build Tag'; $lang->job->execSuccess = 'Build success'; -$lang->job->browseAction = 'Job List'; +$lang->job->browseAction = 'Pipeline List'; $lang->job->id = 'ID'; $lang->job->name = 'Name'; diff --git a/module/job/lang/en.php b/module/job/lang/en.php index bb45238cf5..f0a96e0250 100644 --- a/module/job/lang/en.php +++ b/module/job/lang/en.php @@ -12,7 +12,7 @@ $lang->job->dirChange = 'Directory Changed'; $lang->job->buildTag = 'Build Tag'; $lang->job->execSuccess = 'Build success'; -$lang->job->browseAction = 'Job List'; +$lang->job->browseAction = 'Pipeline List'; $lang->job->id = 'ID'; $lang->job->name = 'Name'; diff --git a/module/job/lang/fr.php b/module/job/lang/fr.php index f8990efd66..670711c366 100644 --- a/module/job/lang/fr.php +++ b/module/job/lang/fr.php @@ -12,7 +12,7 @@ $lang->job->dirChange = 'Directory Changed'; $lang->job->buildTag = 'Build Tag'; $lang->job->execSuccess = 'Build success'; -$lang->job->browseAction = 'Job List'; +$lang->job->browseAction = 'Pipeline List'; $lang->job->id = 'ID'; $lang->job->name = 'Nom'; diff --git a/module/job/lang/zh-cn.php b/module/job/lang/zh-cn.php index 7719656d11..91540ffa73 100644 --- a/module/job/lang/zh-cn.php +++ b/module/job/lang/zh-cn.php @@ -12,7 +12,7 @@ $lang->job->dirChange = '目录改动'; $lang->job->buildTag = '打标签'; $lang->job->execSuccess = '执行成功'; -$lang->job->browseAction = '构建任务列表'; +$lang->job->browseAction = '流水线列表'; $lang->job->id = 'ID'; $lang->job->name = '名称'; From 6dc8970c49db9edca07c2b2acea3a5c1f4933f7a Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:44:40 +0800 Subject: [PATCH 286/347] * Rename the privilege of job-view. --- module/job/lang/de.php | 2 +- module/job/lang/en.php | 2 +- module/job/lang/fr.php | 2 +- module/job/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/job/lang/de.php b/module/job/lang/de.php index e2b8d05de7..0d9eb1dccc 100644 --- a/module/job/lang/de.php +++ b/module/job/lang/de.php @@ -5,7 +5,7 @@ $lang->job->create = 'Create Pipeline'; $lang->job->edit = 'Edit Pipeline'; $lang->job->exec = 'Execute Pipeline'; $lang->job->runPipeline = 'Run pipeline'; -$lang->job->view = 'Execute Details'; +$lang->job->view = 'Pipeline Details'; $lang->job->delete = 'Delete Pipeline'; $lang->job->confirmDelete = 'Do you want to delete this job?'; $lang->job->dirChange = 'Directory Changed'; diff --git a/module/job/lang/en.php b/module/job/lang/en.php index f0a96e0250..ffbc9e590b 100644 --- a/module/job/lang/en.php +++ b/module/job/lang/en.php @@ -5,7 +5,7 @@ $lang->job->create = 'Create Pipeline'; $lang->job->edit = 'Edit Pipeline'; $lang->job->exec = 'Execute Pipeline'; $lang->job->runPipeline = 'Run pipeline'; -$lang->job->view = 'Execute Details'; +$lang->job->view = 'Pipeline Details'; $lang->job->delete = 'Delete Pipeline'; $lang->job->confirmDelete = 'Do you want to delete this pipeline?'; $lang->job->dirChange = 'Directory Changed'; diff --git a/module/job/lang/fr.php b/module/job/lang/fr.php index 670711c366..d0a1abc2cf 100644 --- a/module/job/lang/fr.php +++ b/module/job/lang/fr.php @@ -5,7 +5,7 @@ $lang->job->create = 'Create Pipeline'; $lang->job->edit = 'Edit Pipeline'; $lang->job->exec = 'Execute Pipeline'; $lang->job->runPipeline = 'Run pipeline'; -$lang->job->view = 'Execute Details'; +$lang->job->view = 'Pipeline Details'; $lang->job->delete = 'Delete Pipeline'; $lang->job->confirmDelete = 'Voullez-vous supprimer ce job ?'; $lang->job->dirChange = 'Directory Changed'; diff --git a/module/job/lang/zh-cn.php b/module/job/lang/zh-cn.php index 91540ffa73..0473dff851 100644 --- a/module/job/lang/zh-cn.php +++ b/module/job/lang/zh-cn.php @@ -5,7 +5,7 @@ $lang->job->create = '添加流水线'; $lang->job->edit = '编辑流水线'; $lang->job->exec = '执行流水线'; $lang->job->runPipeline = '运行流水线'; -$lang->job->view = '执行详情'; +$lang->job->view = '流水线详情'; $lang->job->delete = '删除流水线'; $lang->job->confirmDelete = '确认删除该流水线'; $lang->job->dirChange = '目录改动'; From b0a98696132e6121f13a8bfdefe367a7d16b4ed7 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:46:49 +0800 Subject: [PATCH 287/347] * Rename the privilege of gitlab-browse. --- module/group/lang/resource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 2d7fa1ec6d..92705466f1 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1487,7 +1487,7 @@ $lang->svn->methodOrder[15] = 'apiSync'; /* GitLab. */ $lang->resource->gitlab = new stdclass(); -$lang->resource->gitlab->browse = 'browse'; +$lang->resource->gitlab->browse = 'browseAction'; $lang->resource->gitlab->create = 'create'; $lang->resource->gitlab->edit = 'edit'; $lang->resource->gitlab->view = 'view'; From 74d33f89e0aee0e2fb52617e12beda9cf0a41db5 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:48:17 +0800 Subject: [PATCH 288/347] * Rename the privilege of gitlab-view. --- module/gitlab/lang/de.php | 2 +- module/gitlab/lang/en.php | 2 +- module/gitlab/lang/fr.php | 2 +- module/gitlab/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php index 08fab6f349..ad6bdfad47 100644 --- a/module/gitlab/lang/de.php +++ b/module/gitlab/lang/de.php @@ -4,7 +4,7 @@ $lang->gitlab->browse = 'GitLab Browse'; $lang->gitlab->search = 'Search'; $lang->gitlab->create = 'Create GitLab'; $lang->gitlab->edit = 'Edit GitLab'; -$lang->gitlab->view = 'View GitLab'; +$lang->gitlab->view = 'GitLab Details'; $lang->gitlab->bindUser = 'Permission Setting'; $lang->gitlab->webhook = 'Webhook'; $lang->gitlab->importIssue = 'Import Issue'; diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index 08fab6f349..ad6bdfad47 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -4,7 +4,7 @@ $lang->gitlab->browse = 'GitLab Browse'; $lang->gitlab->search = 'Search'; $lang->gitlab->create = 'Create GitLab'; $lang->gitlab->edit = 'Edit GitLab'; -$lang->gitlab->view = 'View GitLab'; +$lang->gitlab->view = 'GitLab Details'; $lang->gitlab->bindUser = 'Permission Setting'; $lang->gitlab->webhook = 'Webhook'; $lang->gitlab->importIssue = 'Import Issue'; diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php index 0a7f015c43..7a4f6de86d 100644 --- a/module/gitlab/lang/fr.php +++ b/module/gitlab/lang/fr.php @@ -4,7 +4,7 @@ $lang->gitlab->browse = 'GitLab Browse'; $lang->gitlab->search = 'Search'; $lang->gitlab->create = 'Create GitLab'; $lang->gitlab->edit = 'Edit GitLab'; -$lang->gitlab->view = 'View GitLab'; +$lang->gitlab->view = 'GitLab Details'; $lang->gitlab->bindUser = 'Permission Setting'; $lang->gitlab->webhook = 'Webhook'; $lang->gitlab->importIssue = 'Import Issue'; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index 831ae83cd6..275efdba90 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -4,7 +4,7 @@ $lang->gitlab->browse = '浏览GitLab'; $lang->gitlab->search = '搜索'; $lang->gitlab->create = '添加GitLab'; $lang->gitlab->edit = '编辑GitLab'; -$lang->gitlab->view = '查看GitLab'; +$lang->gitlab->view = 'GitLab详情'; $lang->gitlab->bindUser = '权限设置'; $lang->gitlab->webhook = 'Webhook'; $lang->gitlab->importIssue = '关联issue'; From 1ae6d37ad0a5dc07da145955aa16056177de3c6e Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:48:49 +0800 Subject: [PATCH 289/347] * Rename the privilege of gitlab-importIssue. --- module/gitlab/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index 275efdba90..13fa6f815a 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -7,7 +7,7 @@ $lang->gitlab->edit = '编辑GitLab'; $lang->gitlab->view = 'GitLab详情'; $lang->gitlab->bindUser = '权限设置'; $lang->gitlab->webhook = 'Webhook'; -$lang->gitlab->importIssue = '关联issue'; +$lang->gitlab->importIssue = '关联Issue'; $lang->gitlab->delete = '删除GitLab'; $lang->gitlab->confirmDelete = '确认删除该GitLab吗?'; $lang->gitlab->gitlabAvatar = '头像'; From 9aabe76410cb782da64bf87849e35a6bfb7ba592 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:50:09 +0800 Subject: [PATCH 290/347] * Rename the privilege of gitlab-browseProject. --- module/gitlab/lang/de.php | 2 +- module/gitlab/lang/en.php | 2 +- module/gitlab/lang/fr.php | 2 +- module/gitlab/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php index ad6bdfad47..179f8f42c2 100644 --- a/module/gitlab/lang/de.php +++ b/module/gitlab/lang/de.php @@ -32,7 +32,7 @@ $lang->gitlab->placeholderSearch = 'Enter name'; $lang->gitlab->browseAction = 'GitLab List'; $lang->gitlab->deleteAction = 'Delete GitLab'; $lang->gitlab->gitlabProject = "GitLab Project"; -$lang->gitlab->browseProject = "Project"; +$lang->gitlab->browseProject = "GitLab Project List"; $lang->gitlab->browseUser = "User"; $lang->gitlab->browseGroup = "Group"; $lang->gitlab->browseBranch = "GitLab Branch List"; diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index ad6bdfad47..179f8f42c2 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -32,7 +32,7 @@ $lang->gitlab->placeholderSearch = 'Enter name'; $lang->gitlab->browseAction = 'GitLab List'; $lang->gitlab->deleteAction = 'Delete GitLab'; $lang->gitlab->gitlabProject = "GitLab Project"; -$lang->gitlab->browseProject = "Project"; +$lang->gitlab->browseProject = "GitLab Project List"; $lang->gitlab->browseUser = "User"; $lang->gitlab->browseGroup = "Group"; $lang->gitlab->browseBranch = "GitLab Branch List"; diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php index 7a4f6de86d..d22e9ea703 100644 --- a/module/gitlab/lang/fr.php +++ b/module/gitlab/lang/fr.php @@ -32,7 +32,7 @@ $lang->gitlab->placeholderSearch = 'Enter name'; $lang->gitlab->browseAction = 'GitLab List'; $lang->gitlab->deleteAction = 'Delete GitLab'; $lang->gitlab->gitlabProject = "GitLab Project"; -$lang->gitlab->browseProject = "Project"; +$lang->gitlab->browseProject = "GitLab Project List"; $lang->gitlab->browseUser = "User"; $lang->gitlab->browseGroup = "Group"; $lang->gitlab->browseBranch = "GitLab Branch List"; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index 13fa6f815a..bdb65ce97a 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -32,7 +32,7 @@ $lang->gitlab->placeholderSearch = '请输入名称'; $lang->gitlab->browseAction = 'GitLab列表'; $lang->gitlab->deleteAction = '删除GitLab'; $lang->gitlab->gitlabProject = "{$lang->gitlab->common}项目"; -$lang->gitlab->browseProject = "项目"; +$lang->gitlab->browseProject = "GitLab项目列表"; $lang->gitlab->browseUser = "用户"; $lang->gitlab->browseGroup = "群组"; $lang->gitlab->browseBranch = "GitLab分支列表"; From 3cd234ae5ceca3138526db05eea7b15e584ddd13 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:51:21 +0800 Subject: [PATCH 291/347] * Rename the privilege of gitlab-browseGroup. --- module/gitlab/lang/de.php | 2 +- module/gitlab/lang/en.php | 2 +- module/gitlab/lang/fr.php | 2 +- module/gitlab/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php index 179f8f42c2..c705c87541 100644 --- a/module/gitlab/lang/de.php +++ b/module/gitlab/lang/de.php @@ -34,7 +34,7 @@ $lang->gitlab->deleteAction = 'Delete GitLab'; $lang->gitlab->gitlabProject = "GitLab Project"; $lang->gitlab->browseProject = "GitLab Project List"; $lang->gitlab->browseUser = "User"; -$lang->gitlab->browseGroup = "Group"; +$lang->gitlab->browseGroup = "GitLab Group List"; $lang->gitlab->browseBranch = "GitLab Branch List"; $lang->gitlab->browseTag = "GitLab Tag List"; $lang->gitlab->browseTagPriv = "Protected tag"; diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index 179f8f42c2..c705c87541 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -34,7 +34,7 @@ $lang->gitlab->deleteAction = 'Delete GitLab'; $lang->gitlab->gitlabProject = "GitLab Project"; $lang->gitlab->browseProject = "GitLab Project List"; $lang->gitlab->browseUser = "User"; -$lang->gitlab->browseGroup = "Group"; +$lang->gitlab->browseGroup = "GitLab Group List"; $lang->gitlab->browseBranch = "GitLab Branch List"; $lang->gitlab->browseTag = "GitLab Tag List"; $lang->gitlab->browseTagPriv = "Protected tag"; diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php index d22e9ea703..f0667ba533 100644 --- a/module/gitlab/lang/fr.php +++ b/module/gitlab/lang/fr.php @@ -34,7 +34,7 @@ $lang->gitlab->deleteAction = 'Delete GitLab'; $lang->gitlab->gitlabProject = "GitLab Project"; $lang->gitlab->browseProject = "GitLab Project List"; $lang->gitlab->browseUser = "User"; -$lang->gitlab->browseGroup = "Group"; +$lang->gitlab->browseGroup = "GitLab Group List"; $lang->gitlab->browseBranch = "GitLab Branch List"; $lang->gitlab->browseTag = "GitLab Tag List"; $lang->gitlab->browseTagPriv = "Protected tag"; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index bdb65ce97a..d27b9d1a88 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -34,7 +34,7 @@ $lang->gitlab->deleteAction = '删除GitLab'; $lang->gitlab->gitlabProject = "{$lang->gitlab->common}项目"; $lang->gitlab->browseProject = "GitLab项目列表"; $lang->gitlab->browseUser = "用户"; -$lang->gitlab->browseGroup = "群组"; +$lang->gitlab->browseGroup = "GitLab群组列表"; $lang->gitlab->browseBranch = "GitLab分支列表"; $lang->gitlab->browseTag = "GitLab标签列表"; $lang->gitlab->browseTagPriv = "标签保护管理"; From fb02dc65bdbda214d37d2b1184ed4557ab55fad5 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:54:50 +0800 Subject: [PATCH 292/347] * Rename the privilege of gitlab-webhook. --- module/gitlab/lang/de.php | 2 +- module/gitlab/lang/en.php | 2 +- module/gitlab/lang/fr.php | 2 +- module/gitlab/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php index c705c87541..3c284a8270 100644 --- a/module/gitlab/lang/de.php +++ b/module/gitlab/lang/de.php @@ -6,7 +6,7 @@ $lang->gitlab->create = 'Create GitLab'; $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'GitLab Details'; $lang->gitlab->bindUser = 'Permission Setting'; -$lang->gitlab->webhook = 'Webhook'; +$lang->gitlab->webhook = 'Interface: Allow Webhook Call'; $lang->gitlab->importIssue = 'Import Issue'; $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index c705c87541..3c284a8270 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -6,7 +6,7 @@ $lang->gitlab->create = 'Create GitLab'; $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'GitLab Details'; $lang->gitlab->bindUser = 'Permission Setting'; -$lang->gitlab->webhook = 'Webhook'; +$lang->gitlab->webhook = 'Interface: Allow Webhook Call'; $lang->gitlab->importIssue = 'Import Issue'; $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php index f0667ba533..9b37b69f3d 100644 --- a/module/gitlab/lang/fr.php +++ b/module/gitlab/lang/fr.php @@ -6,7 +6,7 @@ $lang->gitlab->create = 'Create GitLab'; $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'GitLab Details'; $lang->gitlab->bindUser = 'Permission Setting'; -$lang->gitlab->webhook = 'Webhook'; +$lang->gitlab->webhook = 'Interface: Allow Webhook Call'; $lang->gitlab->importIssue = 'Import Issue'; $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index d27b9d1a88..caed699e81 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -6,7 +6,7 @@ $lang->gitlab->create = '添加GitLab'; $lang->gitlab->edit = '编辑GitLab'; $lang->gitlab->view = 'GitLab详情'; $lang->gitlab->bindUser = '权限设置'; -$lang->gitlab->webhook = 'Webhook'; +$lang->gitlab->webhook = '接口:允许Webhook调用'; $lang->gitlab->importIssue = '关联Issue'; $lang->gitlab->delete = '删除GitLab'; $lang->gitlab->confirmDelete = '确认删除该GitLab吗?'; From 2d534b9551e300114f38d0d6f2005b6ef52c4f81 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:56:12 +0800 Subject: [PATCH 293/347] * Rename the privilege of gogs-browse. --- module/group/lang/resource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 92705466f1..c887dea182 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1551,7 +1551,7 @@ $lang->gitlab->methodOrder[155] = 'deleteTag'; /* Gogs. */ $lang->resource->gogs = new stdclass(); -$lang->resource->gogs->browse = 'browse'; +$lang->resource->gogs->browse = 'browseAction'; $lang->resource->gogs->create = 'create'; $lang->resource->gogs->edit = 'edit'; $lang->resource->gogs->view = 'view'; From e6d10300b0f9be19e89604931d24b26fe7940576 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:57:15 +0800 Subject: [PATCH 294/347] * Rename the privilege of gogs-view. --- module/gogs/lang/de.php | 2 +- module/gogs/lang/en.php | 2 +- module/gogs/lang/fr.php | 2 +- module/gogs/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/gogs/lang/de.php b/module/gogs/lang/de.php index 4f884b7518..ae278521c0 100644 --- a/module/gogs/lang/de.php +++ b/module/gogs/lang/de.php @@ -4,7 +4,7 @@ $lang->gogs->browse = 'Gogs Browse'; $lang->gogs->search = 'Search'; $lang->gogs->create = 'Create Gogs'; $lang->gogs->edit = 'Edit Gogs'; -$lang->gogs->view = 'View Gogs'; +$lang->gogs->view = 'Gogs Details'; $lang->gogs->delete = 'Delete Gogs'; $lang->gogs->confirmDelete = 'Do you want to delete this Gogs server?'; $lang->gogs->bindUser = 'Bind User'; diff --git a/module/gogs/lang/en.php b/module/gogs/lang/en.php index 4f884b7518..ae278521c0 100644 --- a/module/gogs/lang/en.php +++ b/module/gogs/lang/en.php @@ -4,7 +4,7 @@ $lang->gogs->browse = 'Gogs Browse'; $lang->gogs->search = 'Search'; $lang->gogs->create = 'Create Gogs'; $lang->gogs->edit = 'Edit Gogs'; -$lang->gogs->view = 'View Gogs'; +$lang->gogs->view = 'Gogs Details'; $lang->gogs->delete = 'Delete Gogs'; $lang->gogs->confirmDelete = 'Do you want to delete this Gogs server?'; $lang->gogs->bindUser = 'Bind User'; diff --git a/module/gogs/lang/fr.php b/module/gogs/lang/fr.php index 4f884b7518..ae278521c0 100644 --- a/module/gogs/lang/fr.php +++ b/module/gogs/lang/fr.php @@ -4,7 +4,7 @@ $lang->gogs->browse = 'Gogs Browse'; $lang->gogs->search = 'Search'; $lang->gogs->create = 'Create Gogs'; $lang->gogs->edit = 'Edit Gogs'; -$lang->gogs->view = 'View Gogs'; +$lang->gogs->view = 'Gogs Details'; $lang->gogs->delete = 'Delete Gogs'; $lang->gogs->confirmDelete = 'Do you want to delete this Gogs server?'; $lang->gogs->bindUser = 'Bind User'; diff --git a/module/gogs/lang/zh-cn.php b/module/gogs/lang/zh-cn.php index a21dc80ba6..2b0c798486 100644 --- a/module/gogs/lang/zh-cn.php +++ b/module/gogs/lang/zh-cn.php @@ -4,7 +4,7 @@ $lang->gogs->browse = '浏览Gogs'; $lang->gogs->search = '搜索'; $lang->gogs->create = '添加Gogs'; $lang->gogs->edit = '编辑Gogs'; -$lang->gogs->view = '查看Gogs'; +$lang->gogs->view = 'Gogs详情'; $lang->gogs->delete = '删除Gogs'; $lang->gogs->confirmDelete = '确认删除该Gogs吗?'; $lang->gogs->bindUser = '绑定用户'; From e3cd11fa767c78e6e70a459c2b619823f83c8689 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:57:57 +0800 Subject: [PATCH 295/347] * Rename the privilege of gitea-browse. --- module/group/lang/resource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index c887dea182..7b5b05118f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1567,7 +1567,7 @@ $lang->gogs->methodOrder[30] = 'bindUser'; /* Gitea. */ $lang->resource->gitea = new stdclass(); -$lang->resource->gitea->browse = 'browse'; +$lang->resource->gitea->browse = 'browseAction'; $lang->resource->gitea->create = 'create'; $lang->resource->gitea->edit = 'edit'; $lang->resource->gitea->view = 'view'; From 71b28c4c6d6cb0c4785afa3bcd709dd813f570af Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 15:59:06 +0800 Subject: [PATCH 296/347] * Rename the privilege of gitea-view. --- module/gitea/lang/de.php | 2 +- module/gitea/lang/en.php | 2 +- module/gitea/lang/fr.php | 2 +- module/gitea/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/gitea/lang/de.php b/module/gitea/lang/de.php index 6ed177b6f3..9cff6aac7f 100644 --- a/module/gitea/lang/de.php +++ b/module/gitea/lang/de.php @@ -4,7 +4,7 @@ $lang->gitea->browse = 'Gitea Browse'; $lang->gitea->search = 'Search'; $lang->gitea->create = 'Create Gitea'; $lang->gitea->edit = 'Edit Gitea'; -$lang->gitea->view = 'View Gitea'; +$lang->gitea->view = 'Gitea Details'; $lang->gitea->delete = 'Delete Gitea'; $lang->gitea->confirmDelete = 'Do you want to delete this Gitea server?'; $lang->gitea->bindUser = 'Bind User'; diff --git a/module/gitea/lang/en.php b/module/gitea/lang/en.php index 6ed177b6f3..9cff6aac7f 100644 --- a/module/gitea/lang/en.php +++ b/module/gitea/lang/en.php @@ -4,7 +4,7 @@ $lang->gitea->browse = 'Gitea Browse'; $lang->gitea->search = 'Search'; $lang->gitea->create = 'Create Gitea'; $lang->gitea->edit = 'Edit Gitea'; -$lang->gitea->view = 'View Gitea'; +$lang->gitea->view = 'Gitea Details'; $lang->gitea->delete = 'Delete Gitea'; $lang->gitea->confirmDelete = 'Do you want to delete this Gitea server?'; $lang->gitea->bindUser = 'Bind User'; diff --git a/module/gitea/lang/fr.php b/module/gitea/lang/fr.php index 6ed177b6f3..9cff6aac7f 100644 --- a/module/gitea/lang/fr.php +++ b/module/gitea/lang/fr.php @@ -4,7 +4,7 @@ $lang->gitea->browse = 'Gitea Browse'; $lang->gitea->search = 'Search'; $lang->gitea->create = 'Create Gitea'; $lang->gitea->edit = 'Edit Gitea'; -$lang->gitea->view = 'View Gitea'; +$lang->gitea->view = 'Gitea Details'; $lang->gitea->delete = 'Delete Gitea'; $lang->gitea->confirmDelete = 'Do you want to delete this Gitea server?'; $lang->gitea->bindUser = 'Bind User'; diff --git a/module/gitea/lang/zh-cn.php b/module/gitea/lang/zh-cn.php index b51208fc93..30a8bfec17 100644 --- a/module/gitea/lang/zh-cn.php +++ b/module/gitea/lang/zh-cn.php @@ -4,7 +4,7 @@ $lang->gitea->browse = '浏览Gitea'; $lang->gitea->search = '搜索'; $lang->gitea->create = '添加Gitea'; $lang->gitea->edit = '编辑Gitea'; -$lang->gitea->view = '查看Gitea'; +$lang->gitea->view = 'Gitea详情'; $lang->gitea->delete = '删除Gitea'; $lang->gitea->confirmDelete = '确认删除该Gitea吗?'; $lang->gitea->bindUser = '绑定用户'; From 98b6ac8fd44f5c1359420ccd6476cbe1827796fe Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 14 Apr 2023 16:00:27 +0800 Subject: [PATCH 297/347] * Rename the privilege of sonarqube-browse. --- module/sonarqube/lang/de.php | 2 +- module/sonarqube/lang/en.php | 2 +- module/sonarqube/lang/fr.php | 2 +- module/sonarqube/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/sonarqube/lang/de.php b/module/sonarqube/lang/de.php index 2eafb85548..90c759611b 100644 --- a/module/sonarqube/lang/de.php +++ b/module/sonarqube/lang/de.php @@ -1,7 +1,7 @@ sonarqube = new stdclass; $lang->sonarqube->common = 'SonarQube'; -$lang->sonarqube->browse = 'SonarQube Browse'; +$lang->sonarqube->browse = 'SonarQube List'; $lang->sonarqube->search = 'Search'; $lang->sonarqube->create = 'Create SonarQube'; $lang->sonarqube->edit = 'Edit SonarQube'; diff --git a/module/sonarqube/lang/en.php b/module/sonarqube/lang/en.php index 2eafb85548..90c759611b 100644 --- a/module/sonarqube/lang/en.php +++ b/module/sonarqube/lang/en.php @@ -1,7 +1,7 @@ sonarqube = new stdclass; $lang->sonarqube->common = 'SonarQube'; -$lang->sonarqube->browse = 'SonarQube Browse'; +$lang->sonarqube->browse = 'SonarQube List'; $lang->sonarqube->search = 'Search'; $lang->sonarqube->create = 'Create SonarQube'; $lang->sonarqube->edit = 'Edit SonarQube'; diff --git a/module/sonarqube/lang/fr.php b/module/sonarqube/lang/fr.php index 2eafb85548..90c759611b 100644 --- a/module/sonarqube/lang/fr.php +++ b/module/sonarqube/lang/fr.php @@ -1,7 +1,7 @@ sonarqube = new stdclass; $lang->sonarqube->common = 'SonarQube'; -$lang->sonarqube->browse = 'SonarQube Browse'; +$lang->sonarqube->browse = 'SonarQube List'; $lang->sonarqube->search = 'Search'; $lang->sonarqube->create = 'Create SonarQube'; $lang->sonarqube->edit = 'Edit SonarQube'; diff --git a/module/sonarqube/lang/zh-cn.php b/module/sonarqube/lang/zh-cn.php index 897dcc9ad4..e2d8854b2a 100644 --- a/module/sonarqube/lang/zh-cn.php +++ b/module/sonarqube/lang/zh-cn.php @@ -1,7 +1,7 @@ sonarqube = new stdclass; $lang->sonarqube->common = 'SonarQube'; -$lang->sonarqube->browse = '浏览SonarQube'; +$lang->sonarqube->browse = 'SonarQube列表'; $lang->sonarqube->search = '搜索'; $lang->sonarqube->create = '添加SonarQube'; $lang->sonarqube->edit = '编辑SonarQube'; From febfc7b228ad036ebde9c696c23b6e6ce5059853 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 17 Apr 2023 09:20:09 +0800 Subject: [PATCH 298/347] * Finish task #91276. --- module/productplan/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/productplan/model.php b/module/productplan/model.php index e1b876f9b6..16d40746e6 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -143,7 +143,7 @@ class productplanModel extends model ->where('1=1') ->beginIF(strpos($param, 'noproduct') === false or !empty($product))->andWhere('t1.product')->eq($product)->fi() ->andWhere('t2.deleted')->eq(0) - ->andWhere('t1.plan')->like(",$planID,") + ->andWhere('t1.plan')->like("%,$planID,%") ->andWhere('t2.type')->in('sprint,stage,kanban') ->orderBy('project_desc') ->fetchAll('project'); From b4baf698999a175b8ae52fe95ea168fadf5c7ed6 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 17 Apr 2023 09:28:08 +0800 Subject: [PATCH 299/347] * Finish task #91355. --- module/task/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index 86de28ea70..c727455d0c 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2676,7 +2676,7 @@ class taskModel extends model ->beginIF($type == 'assignedTo' and ($this->app->rawModule == 'my' or $this->app->rawModule == 'block'))->andWhere('t2.status', true)->ne('suspended')->orWhere('t4.status')->ne('suspended')->markRight(1)->fi() ->beginIF($type != 'all' and $type != 'finishedBy' and $type != 'assignedTo')->andWhere("t1.`$type`")->eq($account)->fi() ->beginIF($type == 'assignedTo')->andWhere("(t1.assignedTo = '{$account}' or (t1.mode = 'multi' and t5.`account` = '{$account}' and t1.status != 'closed' and t5.status != 'done') )")->fi() - ->beginIF($type == 'assignedTo' and $this->app->rawModule == 'my' and $this->app->rawMethod == 'work')->andWhere('t1.status')->notin('closed,cancel,pause')->fi() + ->beginIF($type == 'assignedTo' and $this->app->rawModule == 'my' and $this->app->rawMethod == 'work')->andWhere('t1.status')->notin('closed,cancel')->fi() ->orderBy($orderBy) ->beginIF($limit > 0)->limit($limit)->fi() ->page($pager, 't1.id') From 5f4610a151f69a2253ba5ceb4790b18cb18b9b5d Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 17 Apr 2023 10:50:40 +0800 Subject: [PATCH 300/347] * Remove extra spaces. --- module/group/view/privbypackage.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/view/privbypackage.html.php b/module/group/view/privbypackage.html.php index afc25b7ed0..e1d5c0f6bb 100644 --- a/module/group/view/privbypackage.html.php +++ b/module/group/view/privbypackage.html.php @@ -123,7 +123,7 @@