diff --git a/module/group/control.php b/module/group/control.php index 3059ff31cc..13e1ce479b 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -13,7 +13,7 @@ class group extends control { /** * Construct function. - * + * * @access public * @return void */ @@ -26,7 +26,7 @@ class group extends control /** * Browse groups. - * + * * @access public * @return void */ @@ -49,7 +49,7 @@ class group extends control /** * Create a group. - * + * * @access public * @return void */ @@ -70,8 +70,8 @@ class group extends control /** * Edit a group. - * - * @param int $groupID + * + * @param int $groupID * @access public * @return void */ @@ -86,6 +86,7 @@ class group extends control $title = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->edit; $position[] = $this->lang->group->edit; + $this->view->title = $title; $this->view->position = $position; $this->view->group = $this->group->getById($groupID); @@ -95,8 +96,8 @@ class group extends control /** * Copy a group. - * - * @param int $groupID + * + * @param int $groupID * @access public * @return void */ @@ -141,7 +142,7 @@ class group extends control $this->view->position[] = $this->lang->group->manageView; $this->view->group = $group; - $this->view->programs = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq('0')->andWhere('type')->eq('program')->orderBy('order_desc')->fetchPairs('id', 'name'); + $this->view->programs = $this->dao->select('*')->from(TABLE_PROGRAM)->where('deleted')->eq('0')->andWhere('type')->eq('program')->orderBy('order_desc')->fetchPairs('id', 'name'); $this->view->projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('deleted')->eq('0')->andWhere('type')->eq('project')->orderBy('order_desc')->fetchPairs('id', 'name'); $this->view->products = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->orderBy('order_desc')->fetchPairs('id', 'name'); @@ -185,7 +186,7 @@ class group extends control if($this->config->systemMode == 'classic') { - if(isset($groupPrivs['program']['prjbrowse'])) + if(isset($groupPrivs['project']['browse'])) { $groupPrivs['project']['list'] = 'list'; } @@ -233,8 +234,8 @@ class group extends control /** * Manage members of a group. - * - * @param int $groupID + * + * @param int $groupID * @param int $deptID * @access public * @return void @@ -268,18 +269,18 @@ class group extends control /** * Manage members of a group. - * - * @param int $groupID + * + * @param int $groupID * @param int $deptID * @access public * @return void */ - public function managePRJAdmin($groupID, $deptID = 0) + public function manageProjectAdmin($groupID, $deptID = 0) { if(!empty($_POST)) { - $this->group->updatePRJAdmin($groupID); - die(js::locate(inlink('managePRJAdmin', "group=$groupID"), 'parent')); + $this->group->updateProjectAdmin($groupID); + die(js::locate(inlink('manageProjectAdmin', "group=$groupID"), 'parent')); } $group = $this->group->getById($groupID); $groupUsers = $this->group->getUserPairs($groupID); @@ -295,7 +296,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('type')->eq('project')->andWhere('deleted')->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', 'createManageProjectAdminLink'), $groupID); $this->view->groupUsers = $groupUsers; $this->view->userPrograms = $userPrograms; @@ -304,8 +305,8 @@ class group extends control /** * Delete a group. - * - * @param int $groupID + * + * @param int $groupID * @param string $confirm yes|no * @access public * @return void diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 0029e00152..c409ea8634 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->manageProjectAdmin = '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 9a19ce3041..59007182f7 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->manageProjectAdmin = '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 b533116b2a..778ec86411 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->manageProjectAdmin = '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/vi.php b/module/group/lang/vi.php index a7cf9d41db..f6fb87f221 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->manageProjectAdmin = '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 e3cbc70c92..17c8462223 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->manageProjectAdmin = '维护项目管理员'; $lang->group->confirmDelete = '您确定删除该用户分组吗？'; $lang->group->successSaved = '成功保存'; $lang->group->errorNotSaved = '没有保存，请确认选择了权限数据。'; diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php index 1fefa4e4cd..de40fd1752 100644 --- a/module/group/lang/zh-tw.php +++ b/module/group/lang/zh-tw.php @@ -21,7 +21,7 @@ $lang->group->managePrivByGroup = '權限維護'; $lang->group->managePrivByModule = '按模組分配權限'; $lang->group->byModuleTips = '（可以按住Shift或者Ctrl鍵進行多選）'; $lang->group->manageMember = '成員維護'; -$lang->group->managePRJAdmin = '維護項目管理員'; +$lang->group->manageProjectAdmin = '維護項目管理員'; $lang->group->confirmDelete = '您確定刪除該用戶分組嗎？'; $lang->group->successSaved = '成功保存'; $lang->group->errorNotSaved = '沒有保存，請確認選擇了權限數據。'; diff --git a/module/group/model.php b/module/group/model.php index 5bcfbfacb3..4bba75431b 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -15,14 +15,14 @@ class groupModel extends model { /** * Create a group. - * + * * @access public * @return bool */ public function create() { $group = fixer::input('post')->get(); - if(isset($group->limited)) + if(isset($group->limited)) { unset($group->limited); $group->role = 'limited'; @@ -32,8 +32,8 @@ class groupModel extends model /** * Update a group. - * - * @param int $groupID + * + * @param int $groupID * @access public * @return void */ @@ -45,8 +45,8 @@ class groupModel extends model /** * Copy a group. - * - * @param int $groupID + * + * @param int $groupID * @access public * @return void */ @@ -66,9 +66,9 @@ class groupModel extends model /** * Copy privileges. - * - * @param string $fromGroup - * @param string $toGroup + * + * @param string $fromGroup + * @param string $toGroup * @access public * @return void */ @@ -84,9 +84,9 @@ class groupModel extends model /** * Copy user. - * - * @param string $fromGroup - * @param string $toGroup + * + * @param string $fromGroup + * @param string $toGroup * @access public * @return void */ @@ -102,32 +102,32 @@ class groupModel extends model /** * Get group lists. - * + * * @param int $projectID * @access public * @return array */ public function getList($projectID = 0) { - return $this->dao->select('*')->from(TABLE_GROUP)->where('PRJ')->eq($projectID)->orderBy('id')->fetchAll(); + return $this->dao->select('*')->from(TABLE_GROUP)->where('project')->eq($projectID)->orderBy('id')->fetchAll(); } /** * Get group pairs. - * + * * @param int $projectID * @access public * @return array */ public function getPairs($projectID = 0) { - return $this->dao->select('id, name')->from(TABLE_GROUP)->where('PRJ')->eq($projectID)->orderBy('id')->fetchPairs(); + return $this->dao->select('id, name')->from(TABLE_GROUP)->where('project')->eq($projectID)->orderBy('id')->fetchPairs(); } /** * Get group by id. - * - * @param int $groupID + * + * @param int $groupID * @access public * @return object */ @@ -141,8 +141,8 @@ class groupModel extends model /** * Get group by account. - * - * @param string $account + * + * @param string $account * @access public * @return array */ @@ -171,8 +171,8 @@ class groupModel extends model /** * Get privileges of a groups. - * - * @param int $groupID + * + * @param int $groupID * @access public * @return array */ @@ -186,8 +186,8 @@ class groupModel extends model /** * Get user pairs of a group. - * - * @param int $groupID + * + * @param int $groupID * @access public * @return array */ @@ -204,14 +204,14 @@ class groupModel extends model /** * Get user programs of a group. - * - * @param int $groupID + * + * @param int $groupID * @access public * @return array */ public function getUserPrograms($groupID) { - return $this->dao->select('t1.account, t1.PRJ') + return $this->dao->select('t1.account, t1.project') ->from(TABLE_USERGROUP)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account') ->where('`group`')->eq((int)$groupID) @@ -258,8 +258,8 @@ class groupModel extends model /** * Delete a group. - * - * @param int $groupID + * + * @param int $groupID * @param null $null compatible with that of model::delete() * @access public * @return void @@ -396,7 +396,7 @@ class groupModel extends model /** * Update privilege by module. - * + * * @access public * @return void */ @@ -420,8 +420,8 @@ class groupModel extends model /** * Update users. - * - * @param int $groupID + * + * @param int $groupID * @access public * @return void */ @@ -455,13 +455,13 @@ class groupModel extends model } /** - * Update program admins. - * - * @param int $groupID + * Update project admins. + * + * @param int $groupID * @access public * @return void */ - public function updatePRJAdmin($groupID) + public function updateProjectAdmin($groupID) { $this->loadModel('user'); $this->dao->delete()->from(TABLE_USERGROUP)->where('`group`')->eq($groupID)->exec(); @@ -474,10 +474,10 @@ class groupModel extends model $data = new stdclass(); $data->group = $groupID; $data->account = $account; - $data->PRJ = implode($programs[$account], ','); + $data->project = implode($programs[$account], ','); $this->dao->replace(TABLE_USERGROUP)->data($data)->exec(); - foreach($programs[$account] as $programID) + foreach($programs[$account] as $programID) { if(!$programID) continue; $this->user->updateUserView($programID, 'program'); @@ -487,10 +487,10 @@ class groupModel extends model if(!dao::isError()) return true; return false; } - + /** * Sort resource. - * + * * @access public * @return void */ @@ -511,7 +511,7 @@ class groupModel extends model { $this->lang->resource->$key = $resource; } - + /* sort methodOrder. */ foreach($this->lang->resource as $moduleName => $resources) { @@ -577,9 +577,9 @@ class groupModel extends model /** * Judge an action is clickable or not. - * - * @param object $group - * @param string $action + * + * @param object $group + * @param string $action * @static * @access public * @return bool @@ -588,8 +588,8 @@ class groupModel extends model { $action = strtolower($action); - if($action == 'manageview' and $group->role == 'limited') return false; - if($action == 'copy' and $group->role == 'limited') return false; + if($action == 'manageview' and $group->role == 'limited') return false; + if($action == 'copy' and $group->role == 'limited') return false; return true; } diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index 04d709fdfb..a92dbf2230 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -42,23 +42,23 @@ desc;?> - role == 'PRJAdmin';?> - + role == 'projectAdmin';?> + 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%'");?> + id", $group, 'list', 'persons', '', "iframe", true, "data-width='90%'");?> id", $group, 'list', '', '', "iframe $disabled", true, "data-width='550'");?> id", $group, 'list', '', '', "iframe $disabled", true, "data-width='550'");?> "; } diff --git a/module/group/view/create.html.php b/module/group/view/create.html.php index f878856eea..3a2a6837e6 100644 --- a/module/group/view/create.html.php +++ b/module/group/view/create.html.php @@ -11,24 +11,24 @@ */ ?> -
+

group->create;?>

- +
- + - + - + diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php index 5cbc4f83a7..d07ae0a257 100644 --- a/module/group/view/edit.html.php +++ b/module/group/view/edit.html.php @@ -11,7 +11,7 @@ */ ?> -
+

id;?> @@ -20,15 +20,15 @@

-
group->name;?>
group->desc;?>
group->limited;?>
+
- + - + diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php index 8ef983ca13..5c0aefa6db 100644 --- a/module/group/view/managemember.html.php +++ b/module/group/view/managemember.html.php @@ -29,7 +29,7 @@
-
group->name;?> name, "class='form-control'");?>
group->desc;?> desc, "rows='5' class='form-control'");?>
+
@@ -60,7 +60,7 @@
- goback, $this->createLink('group', 'browse')); echo html::hidden('foo'); // Just a var, to make sure $_POST is not empty. diff --git a/module/group/view/manageprjadmin.html.php b/module/group/view/manageprjadmin.html.php deleted file mode 100644 index b17d444b21..0000000000 --- a/module/group/view/manageprjadmin.html.php +++ /dev/null @@ -1,84 +0,0 @@ - - * @package group - * @version $Id: managemember.html.php 4627 2013-04-10 05:42:20Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -?> - -
- -
- - - - - $program):?> - - - - - - - - - - - - - - - - - - - -
group->inside : '';?> -
- 		-
- group->manageProject;?> - -
- 		- - -
group->inside;?> -
- 		-
- group->manageProject;?> - -
- 		- - -
- goback, $this->createLink('group', 'browse')); - echo html::hidden('foo'); // Just a var, to make sure $_POST is not empty. - ?> -
- -
-
-