From a16da916abf84dc607317a086e6ce11999f9dff6 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 20 Oct 2020 14:18:39 +0800 Subject: [PATCH] * Rename PRJadmin to PRJAdmin. --- db/update20.0.sql | 2 +- db/zentao.sql | 2 +- module/dept/model.php | 4 ++-- module/group/control.php | 8 ++++---- module/group/lang/de.php | 2 +- module/group/lang/en.php | 2 +- module/group/lang/fr.php | 2 +- module/group/lang/resource.php | 4 ++-- module/group/lang/vi.php | 2 +- module/group/lang/zh-cn.php | 2 +- module/group/model.php | 2 +- module/group/view/browse.html.php | 10 +++++----- module/program/model.php | 10 +++++----- module/upgrade/control.php | 12 ++++++------ module/upgrade/lang/zh-cn.php | 2 +- module/upgrade/model.php | 18 +++++++++--------- module/upgrade/view/createprogram.html.php | 4 ++-- module/user/model.php | 6 +++--- 18 files changed, 47 insertions(+), 47 deletions(-) diff --git a/db/update20.0.sql b/db/update20.0.sql index 8d60b475f9..729a3c4b0d 100644 --- a/db/update20.0.sql +++ b/db/update20.0.sql @@ -31,7 +31,7 @@ ALTER TABLE `zt_build` ADD `PRJ` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_release` ADD `PRJ` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_group` ADD `PRJ` mediumint NOT NULL AFTER `id`; -INSERT INTO `zt_group` (`name`, `role`, `desc`) VALUES ('项目管理员', 'PRJadmin', '项目管理员可以维护项目的权限'); +INSERT INTO `zt_group` (`name`, `role`, `desc`) VALUES ('项目管理员', 'PRJAdmin', '项目管理员可以维护项目的权限'); ALTER TABLE `zt_usergroup` ADD `PRJ` text NOT NULL; diff --git a/db/zentao.sql b/db/zentao.sql index acb4426c1b..e0ecdab67a 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1444,7 +1444,7 @@ INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES (10, 'OTHERS', 'others', 'for others.'), (11, 'guest', 'guest', 'For guest'), (12, 'LIMITED', 'limited', 'For limited user'), -(13, '项目管理员', 'pgmadmin', '项目管理员可以维护项目的权限'); +(13, '项目管理员', 'PRJAdmin', '项目管理员可以维护项目的权限'); INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'action', 'editComment'), diff --git a/module/dept/model.php b/module/dept/model.php index 041dcef4aa..4b92f4bc70 100644 --- a/module/dept/model.php +++ b/module/dept/model.php @@ -252,9 +252,9 @@ class deptModel extends model * @access public * @return string */ - public function createManagePRJadminLink($dept, $groupID) + public function createManagePRJAdminLink($dept, $groupID) { - return html::a(helper::createLink('group', 'managePRJadmin', "groupID=$groupID&deptID={$dept->id}"), $dept->name, '_self', "id='dept{$dept->id}'"); + return html::a(helper::createLink('group', 'managePRJAdmin', "groupID=$groupID&deptID={$dept->id}"), $dept->name, '_self', "id='dept{$dept->id}'"); } /** diff --git a/module/group/control.php b/module/group/control.php index 8c6e827603..e3425a3a97 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -264,12 +264,12 @@ class group extends control * @access public * @return void */ - public function managePRJadmin($groupID, $deptID = 0) + public function managePRJAdmin($groupID, $deptID = 0) { if(!empty($_POST)) { - $this->group->updatePRJadmin($groupID); - die(js::locate(inlink('managePRJadmin', "group=$groupID"), 'parent')); + $this->group->updatePRJAdmin($groupID); + die(js::locate(inlink('managePRJAdmin', "group=$groupID"), 'parent')); } $group = $this->group->getById($groupID); $groupUsers = $this->group->getUserPairs($groupID); @@ -285,7 +285,7 @@ class group extends control $this->view->allUsers = $allUsers; $this->view->group = $group; $this->view->programs = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('program')->eq(0)->andWhere('deleted')->eq(0)->andWhere('isCat')->eq(0)->fetchPairs(); - $this->view->deptTree = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createManagePRJadminLink'), $groupID); + $this->view->deptTree = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createManagePRJAdminLink'), $groupID); $this->view->groupUsers = $groupUsers; $this->view->userPrograms = $userPrograms; diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 97957307ca..0916b8ff24 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -21,7 +21,7 @@ $lang->group->managePrivByGroup = 'Rechte'; $lang->group->managePrivByModule = 'Modul Rechte'; $lang->group->byModuleTips = '(SHIFT/STRG für Multi-Select)'; $lang->group->manageMember = 'Mitglieder'; -$lang->group->managePRJadmin = 'Manage Program Admins'; +$lang->group->managePRJAdmin = 'Manage Program Admins'; $lang->group->confirmDelete = 'Möchten Sie die Gruppe löschen?'; $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 79beef7670..fd9b2185d2 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -21,7 +21,7 @@ $lang->group->managePrivByGroup = 'Manage Privileges by Group'; $lang->group->managePrivByModule = 'Manage Privileges by Module'; $lang->group->byModuleTips = '(Press Shift/Ctrl to Multi-select)'; $lang->group->manageMember = 'Manage Members'; -$lang->group->managePRJadmin = 'Manage Program Admins'; +$lang->group->managePRJAdmin = 'Manage Program Admins'; $lang->group->confirmDelete = 'Do you want to delete this user group?'; $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 3de195fb3a..0284d6ce5a 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -21,7 +21,7 @@ $lang->group->managePrivByGroup = 'Gérer Privilèges par Groupe'; $lang->group->managePrivByModule = 'Gérer Privilèges par Module'; $lang->group->byModuleTips = '(Shift/Ctrl pour sélection multiple)'; $lang->group->manageMember = 'Gérer Membres'; -$lang->group->managePRJadmin = 'Manage Program Admins'; +$lang->group->managePRJAdmin = 'Manage Program Admins'; $lang->group->confirmDelete = "Voulez-vous supprimer ce groupe d'utilisateurs ?"; $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 fad663476a..2b06041917 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1199,7 +1199,7 @@ $lang->resource->group->delete = 'delete'; $lang->resource->group->manageView = 'manageView'; $lang->resource->group->managePriv = 'managePriv'; $lang->resource->group->manageMember = 'manageMember'; -$lang->resource->group->managePRJadmin = 'managePRJadmin'; +$lang->resource->group->managePRJAdmin = 'managePRJAdmin'; $lang->group->methodOrder[5] = 'browse'; $lang->group->methodOrder[10] = 'create'; @@ -1208,7 +1208,7 @@ $lang->group->methodOrder[20] = 'copy'; $lang->group->methodOrder[25] = 'delete'; $lang->group->methodOrder[30] = 'managePriv'; $lang->group->methodOrder[35] = 'manageMember'; -$lang->group->methodOrder[40] = 'managePRJadmin'; +$lang->group->methodOrder[40] = 'managePRJAdmin'; /* User. */ $lang->resource->user = new stdclass(); diff --git a/module/group/lang/vi.php b/module/group/lang/vi.php index 5e180a632d..63d5097039 100644 --- a/module/group/lang/vi.php +++ b/module/group/lang/vi.php @@ -21,7 +21,7 @@ $lang->group->managePrivByGroup = 'Quản lý Privileges by Group'; $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->managePRJadmin = 'Manage Program Admins'; +$lang->group->managePRJAdmin = 'Manage Program Admins'; $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 c4eaf105ae..9a0120ef4f 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -21,7 +21,7 @@ $lang->group->managePrivByGroup = '权限维护'; $lang->group->managePrivByModule = '按模块分配权限'; $lang->group->byModuleTips = '（可以按住Shift或者Ctrl键进行多选）'; $lang->group->manageMember = '成员维护'; -$lang->group->managePRJadmin = '维护项目管理员'; +$lang->group->managePRJAdmin = '维护项目管理员'; $lang->group->confirmDelete = '您确定删除该用户分组吗？'; $lang->group->successSaved = '成功保存'; $lang->group->errorNotSaved = '没有保存，请确认选择了权限数据。'; diff --git a/module/group/model.php b/module/group/model.php index cfd676f651..f5d1792a00 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -388,7 +388,7 @@ class groupModel extends model * @access public * @return void */ - public function updatePRJadmin($groupID) + public function updatePRJAdmin($groupID) { $this->loadModel('user'); $this->dao->delete()->from(TABLE_USERGROUP)->where('`group`')->eq($groupID)->exec(); diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index a110912fde..04d709fdfb 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -42,14 +42,14 @@ desc;?> - role == 'PRJadmin';?> - + role == 'PRJAdmin';?> + group->managepriv = $lang->group->managePrivByGroup;?> id", $group, 'list', 'eye', '', "$disabled");?> id", $group, 'list', 'lock');?> group->managemember = $lang->group->manageMember;?> - - id", $group, 'list', 'persons');?> + + id", $group, 'list', 'persons');?> id", $group, 'list', 'persons', '', "iframe", true, "data-width='90%'");?> @@ -58,7 +58,7 @@ "; } diff --git a/module/program/model.php b/module/program/model.php index 6a3b133606..fb7b51f9cc 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -294,7 +294,7 @@ class programModel extends model $groupPriv = $this->dao->select('t1.*')->from(TABLE_USERGROUP)->alias('t1') ->leftJoin(TABLE_GROUP)->alias('t2')->on('t1.group = t2.id') ->where('t1.account')->eq($this->app->user->account) - ->andWhere('t2.role')->eq('PRJadmin') + ->andWhere('t2.role')->eq('PRJAdmin') ->fetch(); if(!empty($groupPriv)) @@ -304,10 +304,10 @@ class programModel extends model } else { - $PRJadminID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJadmin')->fetch('id'); + $PRJAdminID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJAdmin')->fetch('id'); $groupPriv = new stdclass(); $groupPriv->account = $this->app->user->account; - $groupPriv->group = $PRJadminID; + $groupPriv->group = $PRJAdminID; $groupPriv->program = $programID; $this->dao->insert(TABLE_USERGROUP)->data($groupPriv)->exec(); } @@ -1107,7 +1107,7 @@ class programModel extends model $groupPriv = $this->dao->select('t1.*')->from(TABLE_USERGROUP)->alias('t1') ->leftJoin(TABLE_GROUP)->alias('t2')->on('t1.group = t2.id') ->where('t1.account')->eq($this->app->user->account) - ->andWhere('t2.role')->eq('PRJadmin') + ->andWhere('t2.role')->eq('PRJAdmin') ->fetch(); if(!empty($groupPriv)) @@ -1117,7 +1117,7 @@ class programModel extends model } else { - $PRJAdminID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJadmin')->fetch('id'); + $PRJAdminID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJAdmin')->fetch('id'); $groupPriv = new stdclass(); $groupPriv->account = $this->app->user->account; $groupPriv->group = $PRJAdminID; diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 1810df515c..f9b42c47f5 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -192,10 +192,10 @@ class upgrade extends control if(isset($_POST['newProgram']) or !isset($_POST['programs'])) { - if(empty($_POST['PRJadmins'])) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->PRJadmin))); + if(empty($_POST['PRJAdmins'])) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->PRJAdmin))); /* Create Program. */ - $programID = $this->upgrade->createProgram($linkedProducts, $linkedProjects, $this->post->PRJadmins); + $programID = $this->upgrade->createProgram($linkedProducts, $linkedProjects, $this->post->PRJAdmins); if(dao::isError()) die(js::error(dao::getError())); } else @@ -237,10 +237,10 @@ class upgrade extends control if(isset($_POST['newProgram']) or !isset($_POST['programs'])) { - if(empty($_POST['PRJadmins'])) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->PRJadmin))); + if(empty($_POST['PRJAdmins'])) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->PRJAdmin))); /* Create Program. */ - $programID = $this->upgrade->createProgram($linkedProducts, $linkedProjects, $this->post->PRJadmins); + $programID = $this->upgrade->createProgram($linkedProducts, $linkedProjects, $this->post->PRJAdmins); if(dao::isError()) die(js::error(dao::getError())); } else @@ -264,10 +264,10 @@ class upgrade extends control $linkedProjects = $this->post->projects; if(isset($_POST['newProgram']) or !isset($_POST['programs'])) { - if(empty($_POST['PRJadmins'])) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->PRJadmin))); + if(empty($_POST['PRJAdmins'])) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->upgrade->PRJAdmin))); /* Create Program. */ - $programID = $this->upgrade->createProgram(array(), $linkedProjects, $this->post->PRJadmins); + $programID = $this->upgrade->createProgram(array(), $linkedProjects, $this->post->PRJAdmins); if(dao::isError()) die(js::error(dao::getError())); } else diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index e2b30bc2c0..6e2fbfc65c 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -77,7 +77,7 @@ EOD; $lang->upgrade->line = '产品线'; $lang->upgrade->program = '归并项目'; $lang->upgrade->existPGM = '已有项目'; -$lang->upgrade->PRJadmin = '项目管理员'; +$lang->upgrade->PRJAdmin = '项目管理员'; $lang->upgrade->product = $lang->productCommon; $lang->upgrade->project = $lang->projectCommon; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 1e5fc9ec0c..ceb05542b6 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -3852,7 +3852,7 @@ class upgradeModel extends model * @access public * @return int */ - public function createProgram($productIdList = array(), $projectIdList = array(), $PRJadmins = '') + public function createProgram($productIdList = array(), $projectIdList = array(), $PRJAdmins = '') { $data = fixer::input('post')->get(); $program = new stdclass(); @@ -3893,18 +3893,18 @@ class upgradeModel extends model $programID = $this->dao->lastInsertId(); $this->dao->update(TABLE_PROJECT)->set('grade')->eq(1)->set('path')->eq(",{$programID},")->where('id')->eq($programID)->exec(); - if($PRJadmins) + if($PRJAdmins) { - $groupID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJadmin')->fetch('id'); + $groupID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJAdmin')->fetch('id'); if($groupID) { - foreach($PRJadmins as $PRJadmin) + foreach($PRJAdmins as $PRJAdmin) { - $userGroup = $this->dao->select('*')->from(TABLE_USERGROUP)->where('account')->eq($PRJadmin)->andWhere('`group`')->eq($groupID)->fetch(); + $userGroup = $this->dao->select('*')->from(TABLE_USERGROUP)->where('account')->eq($PRJAdmin)->andWhere('`group`')->eq($groupID)->fetch(); if(empty($userGroup)) { $userGroup = new stdclass(); - $userGroup->account = $PRJadmin; + $userGroup->account = $PRJAdmin; $userGroup->group = $groupID; $userGroup->program = ''; } @@ -4059,7 +4059,7 @@ class upgradeModel extends model */ public function setDefaultPriv() { - $groups = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->ne('limited')->andWhere('role')->ne('PRJadmin')->fetchPairs(); + $groups = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->ne('limited')->andWhere('role')->ne('PRJAdmin')->fetchPairs(); foreach($groups as $groupID) { $data = new stdclass(); @@ -4072,11 +4072,11 @@ class upgradeModel extends model $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec(); } - $PRJadminGroupID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJadmin')->fetch('id'); + $PRJAdminGroupID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJAdmin')->fetch('id'); foreach($this->lang->resource->program as $method => $methodLang) { $data = new stdclass(); - $data->group = $PRJadminGroupID; + $data->group = $PRJAdminGroupID; $data->module = 'program'; $data->method = $method; $this->dao->replace(TABLE_GROUPPRIV)->data($data)->exec(); diff --git a/module/upgrade/view/createprogram.html.php b/module/upgrade/view/createprogram.html.php index 505388ea55..992312e4f7 100644 --- a/module/upgrade/view/createprogram.html.php +++ b/module/upgrade/view/createprogram.html.php @@ -25,8 +25,8 @@ - upgrade->PRJadmin;?> - + upgrade->PRJAdmin;?> + program->PM;?> diff --git a/module/user/model.php b/module/user/model.php index 183e02add6..7a9de601ca 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -824,7 +824,7 @@ class userModel extends model $groups = $this->dao->select('t1.acl, t1.PRJ')->from(TABLE_GROUP)->alias('t1') ->leftJoin(TABLE_USERGROUP)->alias('t2')->on('t1.id=t2.group') ->where('t2.account')->eq($account) - ->andWhere('t1.role')->ne('PRJadmin') + ->andWhere('t1.role')->ne('PRJAdmin') ->andWhere('t1.role')->ne('limited') ->fetchAll(); @@ -894,8 +894,8 @@ class userModel extends model } /* Get can manage programs by user. */ - $PRJadminGroupID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJadmin')->fetch('id'); - $canManageProjects = $this->dao->select('PRJ')->from(TABLE_USERGROUP)->where('`group`')->eq($PRJadminGroupID)->andWhere('account')->eq($account)->fetch('PRJ'); + $PRJAdminGroupID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJAdmin')->fetch('id'); + $canManageProjects = $this->dao->select('PRJ')->from(TABLE_USERGROUP)->where('`group`')->eq($PRJAdminGroupID)->andWhere('account')->eq($account)->fetch('PRJ'); return array('rights' => $rights, 'acls' => $acls, 'projects' => $canManageProjects); }