From 0b0cdcbda72dd98865a3cc5578ce9dd1b004df0e Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 12 Mar 2021 10:56:47 +0800 Subject: [PATCH] * Rename personnel. --- module/common/lang/de.php | 4 +- module/common/lang/en.php | 4 +- module/common/lang/fr.php | 4 +- module/common/lang/vi.php | 4 +- module/common/lang/zh-cn.php | 4 +- module/common/lang/zh-tw.php | 2 +- module/execution/control.php | 4 +- module/execution/lang/de.php | 2 +- module/execution/lang/en.php | 2 +- module/execution/lang/fr.php | 2 +- module/execution/lang/vi.php | 2 +- module/execution/lang/zh-cn.php | 2 +- module/execution/lang/zh-tw.php | 2 +- module/group/lang/resource.php | 26 +++---- module/personnel/control.php | 10 +-- module/personnel/lang/de.php | 6 +- module/personnel/lang/en.php | 6 +- module/personnel/lang/fr.php | 6 +- module/personnel/lang/vi.php | 6 +- module/personnel/lang/zh-cn.php | 6 +- module/personnel/lang/zh-tw.php | 6 +- module/personnel/model.php | 86 ++++++++++++------------ module/personnel/view/putinto.html.php | 4 +- module/personnel/view/whitelist.html.php | 4 +- module/product/control.php | 4 +- module/product/lang/de.php | 2 +- module/product/lang/en.php | 2 +- module/product/lang/fr.php | 2 +- module/product/lang/vi.php | 2 +- module/product/lang/zh-cn.php | 2 +- module/product/lang/zh-tw.php | 2 +- module/program/lang/zh-tw.php | 2 +- module/project/control.php | 4 +- module/project/lang/de.php | 2 +- module/project/lang/en.php | 2 +- module/project/lang/fr.php | 2 +- module/project/lang/vi.php | 2 +- module/project/lang/zh-cn.php | 2 +- module/project/lang/zh-tw.php | 2 +- 39 files changed, 119 insertions(+), 119 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 95b0ab1dfe..46d50c6725 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -177,12 +177,12 @@ $lang->project->dividerMenu = ',execution,programplan,doc,dynamic,'; $lang->program->viewMenu = new stdclass(); $lang->program->viewMenu->product = array('link' => 'Product|program|product|program=%s', 'alias' => 'view'); $lang->program->viewMenu->project = array('link' => "Project|program|project|program=%s"); -$lang->program->viewMenu->personnel = array('link' => "Member|personnel|putinto|program=%s"); +$lang->program->viewMenu->personnel = array('link' => "Member|personnel|invest|program=%s"); $lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|stakeholder|program=%s", 'alias' => 'createstakeholder'); $lang->personnel = new stdClass(); $lang->personnel->menu = new stdClass(); -$lang->personnel->menu->putinto = array('link' => "Investment|personnel|putinto|program=%s"); +$lang->personnel->menu->invest = array('link' => "Investment|personnel|invest|program=%s"); $lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s"); $lang->personnel->menu->whitelist = array('link' => "Whitelist|personnel|whitelist|program=%s", 'alias' => 'addwhitelist'); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index ed7e32eee7..ecf6c9644d 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -177,12 +177,12 @@ $lang->project->dividerMenu = ',execution,programplan,doc,other,'; $lang->program->viewMenu = new stdclass(); $lang->program->viewMenu->product = array('link' => 'Product|program|product|program=%s', 'alias' => 'view'); $lang->program->viewMenu->project = array('link' => "Project|program|project|program=%s"); -$lang->program->viewMenu->personnel = array('link' => "Member|personnel|putinto|program=%s"); +$lang->program->viewMenu->personnel = array('link' => "Member|personnel|invest|program=%s"); $lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|stakeholder|program=%s", 'alias' => 'createstakeholder'); $lang->personnel = new stdClass(); $lang->personnel->menu = new stdClass(); -$lang->personnel->menu->putinto = array('link' => "Investment|personnel|putinto|program=%s"); +$lang->personnel->menu->invest = array('link' => "Investment|personnel|invest|program=%s"); $lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s"); $lang->personnel->menu->whitelist = array('link' => "Whitelist|personnel|whitelist|program=%s", 'alias' => 'addwhitelist'); diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 6afeb01079..77ecb2d28e 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -177,12 +177,12 @@ $lang->project->dividerMenu = ',execution,programplan,doc,dynamic,'; $lang->program->viewMenu = new stdclass(); $lang->program->viewMenu->product = array('link' => 'Product|program|product|program=%s', 'alias' => 'view'); $lang->program->viewMenu->project = array('link' => "Project|program|project|program=%s"); -$lang->program->viewMenu->personnel = array('link' => "Member|personnel|putinto|program=%s"); +$lang->program->viewMenu->personnel = array('link' => "Member|personnel|invest|program=%s"); $lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|stakeholder|program=%s", 'alias' => 'createstakeholder'); $lang->personnel = new stdClass(); $lang->personnel->menu = new stdClass(); -$lang->personnel->menu->putinto = array('link' => "Investment|personnel|putinto|program=%s"); +$lang->personnel->menu->invest = array('link' => "Investment|personnel|invest|program=%s"); $lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s"); $lang->personnel->menu->whitelist = array('link' => "Whitelist|personnel|whitelist|program=%s", 'alias' => 'addwhitelist'); diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 2d848ef3ff..5495f24549 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -177,12 +177,12 @@ $lang->project->dividerMenu = ',execution,programplan,doc,dynamic,'; $lang->program->viewMenu = new stdclass(); $lang->program->viewMenu->product = array('link' => 'Product|program|product|program=%s', 'alias' => 'view'); $lang->program->viewMenu->project = array('link' => "Project|program|project|program=%s"); -$lang->program->viewMenu->personnel = array('link' => "Member|personnel|putinto|program=%s"); +$lang->program->viewMenu->personnel = array('link' => "Member|personnel|invest|program=%s"); $lang->program->viewMenu->stakeholder = array('link' => "Stakeholder|program|stakeholder|program=%s", 'alias' => 'createstakeholder'); $lang->personnel = new stdClass(); $lang->personnel->menu = new stdClass(); -$lang->personnel->menu->putinto = array('link' => "Investment|personnel|putinto|program=%s"); +$lang->personnel->menu->invest = array('link' => "Investment|personnel|invest|program=%s"); $lang->personnel->menu->accessible = array('link' => "Accessible|personnel|accessible|program=%s"); $lang->personnel->menu->whitelist = array('link' => "Whitelist|personnel|whitelist|program=%s", 'alias' => 'addwhitelist'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 9649086a87..c02cf126db 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -177,12 +177,12 @@ $lang->project->dividerMenu = ',execution,programplan,doc,dynamic,'; $lang->program->viewMenu = new stdclass(); $lang->program->viewMenu->product = array('link' => '产品|program|product|program=%s', 'alias' => 'view'); $lang->program->viewMenu->project = array('link' => "项目|program|project|program=%s"); -$lang->program->viewMenu->personnel = array('link' => "人员|personnel|putinto|program=%s"); +$lang->program->viewMenu->personnel = array('link' => "人员|personnel|invest|program=%s"); $lang->program->viewMenu->stakeholder = array('link' => "干系人|program|stakeholder|program=%s", 'alias' => 'createstakeholder'); $lang->personnel = new stdClass(); $lang->personnel->menu = new stdClass(); -$lang->personnel->menu->putinto = array('link' => "投入人员|personnel|putinto|program=%s"); +$lang->personnel->menu->invest = array('link' => "投入人员|personnel|invest|program=%s"); $lang->personnel->menu->accessible = array('link' => "可访问人员|personnel|accessible|program=%s"); $lang->personnel->menu->whitelist = array('link' => "白名单|personnel|whitelist|program=%s", 'alias' => 'addwhitelist'); diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 21fefcf656..93208c2619 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -186,7 +186,7 @@ $lang->personnel = new stdClass(); $lang->personnel->menu = new stdClass(); $lang->personnel->menu->accessible = array('link' => "可訪問人員|personnel|accessible|program=%s"); $lang->personnel->menu->whitelist = array('link' => "白名單|personnel|whitelist|program=%s", 'alias' => 'addwhitelist'); -$lang->personnel->menu->putinto = array('link' => "投入人員|personnel|putinto|program=%s"); +$lang->personnel->menu->invest = array('link' => "投入人員|personnel|invest|program=%s"); /* Scrum menu. */ $lang->product = new stdclass(); diff --git a/module/execution/control.php b/module/execution/control.php index 56d61823ba..c1a50c7c43 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2678,9 +2678,9 @@ class execution extends control * @access public * @return void */ - public function unbindWhielist($id = 0, $confirm = 'no') + public function unbindWhitelist($id = 0, $confirm = 'no') { - echo $this->fetch('personnel', 'unbindWhielist', "id=$id&confirm=$confirm"); + echo $this->fetch('personnel', 'unbindWhitelist', "id=$id&confirm=$confirm"); } /** diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index bfb0e35db3..5ea630779c 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -51,7 +51,7 @@ $lang->execution->orderAB = "Rank"; $lang->execution->products = "Verknüpfung {$lang->productCommon}"; $lang->execution->whitelist = 'Whitelist'; $lang->execution->addWhitelist = 'Add Whitelist'; -$lang->execution->unbindWhielist = 'Remove Whitelist'; +$lang->execution->unbindWhitelist = 'Remove Whitelist'; $lang->execution->totalEstimate = 'Geplant'; $lang->execution->totalConsumed = 'Genutzt'; $lang->execution->totalLeft = 'Rest'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index a98506283e..57ca932cf4 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -51,7 +51,7 @@ $lang->execution->orderAB = "Rank"; $lang->execution->products = "Link {$lang->productCommon}"; $lang->execution->whitelist = 'Whitelist'; $lang->execution->addWhitelist = 'Add Whitelist'; -$lang->execution->unbindWhielist = 'Remove Whitelist'; +$lang->execution->unbindWhitelist = 'Remove Whitelist'; $lang->execution->totalEstimate = 'Estimates'; $lang->execution->totalConsumed = 'Cost'; $lang->execution->totalLeft = 'Left'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index f44e514127..8e7d0a4805 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -51,7 +51,7 @@ $lang->execution->orderAB = "Rang"; $lang->execution->products = "{$lang->productCommon} liés"; $lang->execution->whitelist = 'Liste Blanche'; $lang->execution->addWhitelist = 'Add Whitelist'; -$lang->execution->unbindWhielist = 'Remove Whitelist'; +$lang->execution->unbindWhitelist = 'Remove Whitelist'; $lang->execution->totalEstimate = 'Estimé'; $lang->execution->totalConsumed = 'Coût'; $lang->execution->totalLeft = 'Reste'; diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php index 7b19d2c572..67285ee4f2 100644 --- a/module/execution/lang/vi.php +++ b/module/execution/lang/vi.php @@ -51,7 +51,7 @@ $lang->execution->orderAB = "Đánh giá"; $lang->execution->products = "Liên kết {$lang->productCommon}"; $lang->execution->whitelist = 'Danh sách trắng'; $lang->execution->addWhitelist = 'Add Whitelist'; -$lang->execution->unbindWhielist = 'Remove Whitelist'; +$lang->execution->unbindWhitelist = 'Remove Whitelist'; $lang->execution->totalEstimate = 'Dự tính'; $lang->execution->totalConsumed = 'Đã làm'; $lang->execution->totalLeft = 'Còn'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 90ace49426..e4cc78362e 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -55,7 +55,7 @@ $lang->execution->orderAB = '排序'; $lang->execution->products = '相关' . $lang->productCommon; $lang->execution->whitelist = '白名单'; $lang->execution->addWhitelist = '添加白名单'; -$lang->execution->unbindWhielist = '删除白名单'; +$lang->execution->unbindWhitelist = '删除白名单'; $lang->execution->totalEstimate = '预计'; $lang->execution->totalConsumed = '消耗'; $lang->execution->totalLeft = '剩余'; diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php index 6aeeee45ee..251238a483 100644 --- a/module/execution/lang/zh-tw.php +++ b/module/execution/lang/zh-tw.php @@ -51,7 +51,7 @@ $lang->project->orderAB = '排序'; $lang->project->products = '相關' . $lang->productCommon; $lang->project->whitelist = '白名單'; $lang->project->addWhitelist = '添加白名單'; -$lang->project->unbindWhielist = '刪除白名單'; +$lang->project->unbindWhitelist = '刪除白名單'; $lang->project->totalEstimate = '預計'; $lang->project->totalConsumed = '消耗'; $lang->project->totalLeft = '剩餘'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index d8bd60adda..86e04ef99d 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -221,7 +221,7 @@ if($config->systemMode == 'new') $lang->resource->project->view = 'view'; $lang->resource->project->whitelist = 'whitelist'; $lang->resource->project->addWhitelist = 'addWhitelist'; - $lang->resource->project->unbindWhielist = 'unbindWhielist'; + $lang->resource->project->unbindWhitelist = 'unbindWhitelist'; $lang->resource->project->manageProducts = 'manageProducts'; $lang->resource->project->view = 'view'; $lang->resource->project->dynamic = 'dynamic'; @@ -249,24 +249,24 @@ if($config->systemMode == 'new') $lang->project->methodOrder[100] = 'view'; $lang->project->methodOrder[105] = 'whitelist'; $lang->project->methodOrder[110] = 'addWhitelist'; - $lang->project->methodOrder[115] = 'unbindWhielist'; + $lang->project->methodOrder[115] = 'unbindWhitelist'; $lang->project->methodOrder[120] = 'manageProducts'; $lang->project->methodOrder[125] = 'view'; $lang->project->methodOrder[130] = 'dynamic'; /* Personnel . */ $lang->resource->personnel = new stdclass(); - $lang->resource->personnel->accessible = 'accessible'; - $lang->resource->personnel->putInto = 'putInto'; - $lang->resource->personnel->whitelist = 'whitelist'; - $lang->resource->personnel->addWhitelist = 'addWhitelist'; - $lang->resource->personnel->unbindWhielist = 'unbindWhielist'; + $lang->resource->personnel->accessible = 'accessible'; + $lang->resource->personnel->invest = 'invest'; + $lang->resource->personnel->whitelist = 'whitelist'; + $lang->resource->personnel->addWhitelist = 'addWhitelist'; + $lang->resource->personnel->unbindWhitelist = 'unbindWhitelist'; $lang->personnel->methodOrder[5] = 'accessible'; - $lang->personnel->methodOrder[10] = 'putInto'; + $lang->personnel->methodOrder[10] = 'invest'; $lang->personnel->methodOrder[15] = 'whitelist'; $lang->personnel->methodOrder[20] = 'addWhitelist'; - $lang->personnel->methodOrder[25] = 'unbindWhielist'; + $lang->personnel->methodOrder[25] = 'unbindWhitelist'; /* Project Story. */ $lang->resource->projectstory = new stdclass(); @@ -340,7 +340,7 @@ $lang->resource->product->build = 'build'; $lang->resource->product->export = 'exportAction'; $lang->resource->product->whitelist = 'whitelist'; $lang->resource->product->addWhitelist = 'addWhitelist'; -$lang->resource->product->unbindWhielist = 'unbindWhielist'; +$lang->resource->product->unbindWhitelist = 'unbindWhitelist'; $lang->product->methodOrder[0] = 'index'; $lang->product->methodOrder[5] = 'browse'; @@ -361,7 +361,7 @@ $lang->product->methodOrder[80] = 'build'; $lang->product->methodOrder[85] = 'export'; $lang->product->methodOrder[90] = 'whitelist'; $lang->product->methodOrder[95] = 'addWhitelist'; -$lang->product->methodOrder[100] = 'unbindWhielist'; +$lang->product->methodOrder[100] = 'unbindWhitelist'; /* Branch. */ $lang->resource->branch = new stdclass(); @@ -577,7 +577,7 @@ $lang->resource->execution->storyKanban = 'storyKanban'; $lang->resource->execution->storySort = 'storySort'; $lang->resource->execution->whitelist = 'whitelist'; $lang->resource->execution->addWhitelist = 'addWhitelist'; -$lang->resource->execution->unbindWhielist = 'unbindWhielist'; +$lang->resource->execution->unbindWhitelist = 'unbindWhitelist'; //if($config->systemMode == 'classic') $lang->resource->project->list = 'list'; $lang->execution->methodOrder[0] = 'index'; @@ -629,7 +629,7 @@ $lang->execution->methodOrder[220] = 'storyKanban'; $lang->execution->methodOrder[225] = 'storySort'; $lang->execution->methodOrder[230] = 'whitelist'; $lang->execution->methodOrder[235] = 'addWhitelist'; -$lang->execution->methodOrder[240] = 'unbindWhielist'; +$lang->execution->methodOrder[240] = 'unbindWhitelist'; /* Task. */ $lang->resource->task = new stdclass(); diff --git a/module/personnel/control.php b/module/personnel/control.php index 2fbdf1a22d..e99a89f94c 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -70,12 +70,12 @@ class personnel extends control * @access public * @return void */ - public function putInto($programID = 0) + public function invest($programID = 0) { $this->setProgramNavMenu($programID); - $this->view->title = $this->lang->personnel->putInto; - $this->view->position[] = $this->lang->personnel->putInto; + $this->view->title = $this->lang->personnel->invest; + $this->view->position[] = $this->lang->personnel->invest; $this->view->inputPersonnel = $this->personnel->getInputPersonnel($programID); $this->display(); @@ -190,11 +190,11 @@ class personnel extends control * @access public * @return void */ - public function unbindWhielist($id = 0, $confirm = 'no') + public function unbindWhitelist($id = 0, $confirm = 'no') { if($confirm == 'no') { - die(js::confirm($this->lang->personnel->confirmDelete, inLink('unbindWhielist',"id=$id&confirm=yes"))); + die(js::confirm($this->lang->personnel->confirmDelete, inLink('unbindWhitelist',"id=$id&confirm=yes"))); } else { diff --git a/module/personnel/lang/de.php b/module/personnel/lang/de.php index ab1aa7622b..3390cdb972 100644 --- a/module/personnel/lang/de.php +++ b/module/personnel/lang/de.php @@ -1,7 +1,7 @@ personnel->common = 'Program Personnel'; $lang->personnel->accessible = 'Acess List'; -$lang->personnel->putInto = 'Input Resource'; +$lang->personnel->invest = 'Input Resource'; $lang->personnel->department = 'Department'; $lang->personnel->realName = 'Name'; $lang->personnel->userName = 'Account'; @@ -21,7 +21,7 @@ $lang->personnel->bug = 'Bug'; $lang->personnel->createStories = 'Story'; $lang->personnel->risk = 'Risk'; $lang->personnel->issue = 'Issue'; -$lang->personnel->putInto = 'Input'; +$lang->personnel->invest = 'Input'; $lang->personnel->left = 'Remained'; $lang->personnel->created = 'Created'; $lang->personnel->finished = 'Finished'; @@ -32,7 +32,7 @@ $lang->personnel->SR = $lang->SRCommon; $lang->personnel->whitelist = 'Whitelist'; $lang->personnel->addWhitelist = 'Add Whitelist'; -$lang->personnel->unbindWhielist = 'Remove Whitelist'; +$lang->personnel->unbindWhitelist = 'Remove Whitelist'; $lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?'; $lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.'; diff --git a/module/personnel/lang/en.php b/module/personnel/lang/en.php index ab1aa7622b..3390cdb972 100644 --- a/module/personnel/lang/en.php +++ b/module/personnel/lang/en.php @@ -1,7 +1,7 @@ personnel->common = 'Program Personnel'; $lang->personnel->accessible = 'Acess List'; -$lang->personnel->putInto = 'Input Resource'; +$lang->personnel->invest = 'Input Resource'; $lang->personnel->department = 'Department'; $lang->personnel->realName = 'Name'; $lang->personnel->userName = 'Account'; @@ -21,7 +21,7 @@ $lang->personnel->bug = 'Bug'; $lang->personnel->createStories = 'Story'; $lang->personnel->risk = 'Risk'; $lang->personnel->issue = 'Issue'; -$lang->personnel->putInto = 'Input'; +$lang->personnel->invest = 'Input'; $lang->personnel->left = 'Remained'; $lang->personnel->created = 'Created'; $lang->personnel->finished = 'Finished'; @@ -32,7 +32,7 @@ $lang->personnel->SR = $lang->SRCommon; $lang->personnel->whitelist = 'Whitelist'; $lang->personnel->addWhitelist = 'Add Whitelist'; -$lang->personnel->unbindWhielist = 'Remove Whitelist'; +$lang->personnel->unbindWhitelist = 'Remove Whitelist'; $lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?'; $lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.'; diff --git a/module/personnel/lang/fr.php b/module/personnel/lang/fr.php index ab1aa7622b..3390cdb972 100644 --- a/module/personnel/lang/fr.php +++ b/module/personnel/lang/fr.php @@ -1,7 +1,7 @@ personnel->common = 'Program Personnel'; $lang->personnel->accessible = 'Acess List'; -$lang->personnel->putInto = 'Input Resource'; +$lang->personnel->invest = 'Input Resource'; $lang->personnel->department = 'Department'; $lang->personnel->realName = 'Name'; $lang->personnel->userName = 'Account'; @@ -21,7 +21,7 @@ $lang->personnel->bug = 'Bug'; $lang->personnel->createStories = 'Story'; $lang->personnel->risk = 'Risk'; $lang->personnel->issue = 'Issue'; -$lang->personnel->putInto = 'Input'; +$lang->personnel->invest = 'Input'; $lang->personnel->left = 'Remained'; $lang->personnel->created = 'Created'; $lang->personnel->finished = 'Finished'; @@ -32,7 +32,7 @@ $lang->personnel->SR = $lang->SRCommon; $lang->personnel->whitelist = 'Whitelist'; $lang->personnel->addWhitelist = 'Add Whitelist'; -$lang->personnel->unbindWhielist = 'Remove Whitelist'; +$lang->personnel->unbindWhitelist = 'Remove Whitelist'; $lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?'; $lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.'; diff --git a/module/personnel/lang/vi.php b/module/personnel/lang/vi.php index ab1aa7622b..3390cdb972 100644 --- a/module/personnel/lang/vi.php +++ b/module/personnel/lang/vi.php @@ -1,7 +1,7 @@ personnel->common = 'Program Personnel'; $lang->personnel->accessible = 'Acess List'; -$lang->personnel->putInto = 'Input Resource'; +$lang->personnel->invest = 'Input Resource'; $lang->personnel->department = 'Department'; $lang->personnel->realName = 'Name'; $lang->personnel->userName = 'Account'; @@ -21,7 +21,7 @@ $lang->personnel->bug = 'Bug'; $lang->personnel->createStories = 'Story'; $lang->personnel->risk = 'Risk'; $lang->personnel->issue = 'Issue'; -$lang->personnel->putInto = 'Input'; +$lang->personnel->invest = 'Input'; $lang->personnel->left = 'Remained'; $lang->personnel->created = 'Created'; $lang->personnel->finished = 'Finished'; @@ -32,7 +32,7 @@ $lang->personnel->SR = $lang->SRCommon; $lang->personnel->whitelist = 'Whitelist'; $lang->personnel->addWhitelist = 'Add Whitelist'; -$lang->personnel->unbindWhielist = 'Remove Whitelist'; +$lang->personnel->unbindWhitelist = 'Remove Whitelist'; $lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?'; $lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.'; diff --git a/module/personnel/lang/zh-cn.php b/module/personnel/lang/zh-cn.php index 43e8b660fe..993b2b48b8 100644 --- a/module/personnel/lang/zh-cn.php +++ b/module/personnel/lang/zh-cn.php @@ -1,7 +1,7 @@ personnel->common = '项目集人员'; $lang->personnel->accessible = '可访问人员列表'; -$lang->personnel->putInto = '投入人员列表'; +$lang->personnel->invest = '投入人员列表'; $lang->personnel->department = '部门'; $lang->personnel->realName = '真实姓名'; $lang->personnel->userName = '用户名'; @@ -21,7 +21,7 @@ $lang->personnel->bug = 'Bug'; $lang->personnel->createStories = '创建需求数'; $lang->personnel->risk = '风险'; $lang->personnel->issue = '问题'; -$lang->personnel->putInto = '已投入'; +$lang->personnel->invest = '已投入'; $lang->personnel->left = '剩余'; $lang->personnel->created = '创建'; $lang->personnel->finished = '完成'; @@ -32,7 +32,7 @@ $lang->personnel->SR = $lang->SRCommon; $lang->personnel->whitelist = '白名单列表'; $lang->personnel->addWhitelist = '添加白名单'; -$lang->personnel->unbindWhielist = '删除白名单'; +$lang->personnel->unbindWhitelist = '删除白名单'; $lang->personnel->confirmDelete = '确认将该用户移除白名单？'; $lang->personnel->openedPGMTip = '该项目集是公开状态，有项目集视图权限的人员即可访问。'; diff --git a/module/personnel/lang/zh-tw.php b/module/personnel/lang/zh-tw.php index 3c39ea8872..1d602c5a00 100644 --- a/module/personnel/lang/zh-tw.php +++ b/module/personnel/lang/zh-tw.php @@ -1,7 +1,7 @@ personnel->common = '項目集人員'; $lang->personnel->accessible = '可訪問人員列表'; -$lang->personnel->putInto = '投入人員列表'; +$lang->personnel->invest = '投入人員列表'; $lang->personnel->department = '部門'; $lang->personnel->realName = '真實姓名'; $lang->personnel->userName = '用戶名'; @@ -21,7 +21,7 @@ $lang->personnel->bug = 'Bug'; $lang->personnel->createStories = '創建需求數'; $lang->personnel->risk = '風險'; $lang->personnel->issue = '問題'; -$lang->personnel->putInto = '已投入'; +$lang->personnel->invest = '已投入'; $lang->personnel->left = '剩餘'; $lang->personnel->created = '創建'; $lang->personnel->finished = '完成'; @@ -32,7 +32,7 @@ $lang->personnel->SR = $lang->SRCommon; $lang->personnel->whitelist = '白名單列表'; $lang->personnel->addWhitelist = '添加白名單'; -$lang->personnel->unbindWhielist = '刪除白名單'; +$lang->personnel->unbindWhitelist = '刪除白名單'; $lang->personnel->confirmDelete = '確認將該用戶移除白名單？'; $lang->personnel->openedPGMTip = '該項目集是公開狀態，有項目集視圖權限的人員即可訪問。'; diff --git a/module/personnel/model.php b/module/personnel/model.php index d1a0a97853..dbec937d9b 100644 --- a/module/personnel/model.php +++ b/module/personnel/model.php @@ -125,22 +125,22 @@ class personnelModel extends model ->fetchAll('id'); /* Initialization personnel risks. */ - $putInto = array(); + $invest = array(); foreach($accounts as $account => $project) { - $putInto[$account]['createdRisk'] = 0; - $putInto[$account]['resolvedRisk'] = 0; - $putInto[$account]['pendingRisk'] = 0; + $invest[$account]['createdRisk'] = 0; + $invest[$account]['resolvedRisk'] = 0; + $invest[$account]['pendingRisk'] = 0; } foreach($risks as $risk) { - if($risk->createdBy && isset($putInto[$risk->createdBy])) $putInto[$risk->createdBy]['createdRisk'] += 1; - if($risk->resolvedBy && isset($putInto[$risk->resolvedBy])) $putInto[$risk->resolvedBy]['resolvedRisk'] += 1; - if($risk->assignedTo && $risk->status == 'active' && isset($putInto[$risk->assignedTo])) $putInto[$risk->assignedTo]['pendingRisk'] += 1; + if($risk->createdBy && isset($invest[$risk->createdBy])) $invest[$risk->createdBy]['createdRisk'] += 1; + if($risk->resolvedBy && isset($invest[$risk->resolvedBy])) $invest[$risk->resolvedBy]['resolvedRisk'] += 1; + if($risk->assignedTo && $risk->status == 'active' && isset($invest[$risk->assignedTo])) $invest[$risk->assignedTo]['pendingRisk'] += 1; } - return $putInto; + return $invest; } /** @@ -159,22 +159,22 @@ class personnelModel extends model ->fetchAll('id'); /* Initialization personnel issues. */ - $putInto = array(); + $invest = array(); foreach($accounts as $account => $project) { - $putInto[$account]['createdIssue'] = 0; - $putInto[$account]['resolvedIssue'] = 0; - $putInto[$account]['pendingIssue'] = 0; + $invest[$account]['createdIssue'] = 0; + $invest[$account]['resolvedIssue'] = 0; + $invest[$account]['pendingIssue'] = 0; } foreach($issues as $issue) { - if($issue->createdBy && isset($putInto[$issue->createdBy])) $putInto[$issue->createdBy]['createdIssue'] += 1; - if($issue->resolvedBy && isset($putInto[$issue->resolvedBy])) $putInto[$issue->resolvedBy]['resolvedIssue'] += 1; - if($issue->assignedTo && in_array($issue->status, array('unconfirmed', 'confirmed', 'active')) && isset($putInto[$issue->assignedTo])) $putInto[$issue->assignedTo]['pendingIssue'] += 1; + if($issue->createdBy && isset($invest[$issue->createdBy])) $invest[$issue->createdBy]['createdIssue'] += 1; + if($issue->resolvedBy && isset($invest[$issue->resolvedBy])) $invest[$issue->resolvedBy]['resolvedIssue'] += 1; + if($issue->assignedTo && in_array($issue->status, array('unconfirmed', 'confirmed', 'active')) && isset($invest[$issue->assignedTo])) $invest[$issue->assignedTo]['pendingIssue'] += 1; } - return $putInto; + return $invest; } /** @@ -212,26 +212,26 @@ class personnelModel extends model ->fetchPairs('openedBy'); /* Initialize bugs and requirements related to personnel. */ - $putInto = array(); + $invest = array(); foreach($accounts as $account => $project) { - $putInto[$account]['createdBug'] = 0; - $putInto[$account]['resolvedBug'] = 0; - $putInto[$account]['pendingBug'] = 0; - $putInto[$account]['UR'] = 0; - $putInto[$account]['SR'] = 0; + $invest[$account]['createdBug'] = 0; + $invest[$account]['resolvedBug'] = 0; + $invest[$account]['pendingBug'] = 0; + $invest[$account]['UR'] = 0; + $invest[$account]['SR'] = 0; } - foreach($requirement as $account => $number) $putInto[$account]['UR'] = $number; - foreach($story as $account => $number) $putInto[$account]['SR'] = $number; + foreach($requirement as $account => $number) $invest[$account]['UR'] = $number; + foreach($story as $account => $number) $invest[$account]['SR'] = $number; foreach($bugs as $bug) { - if($bug->openedBy && isset($putInto[$bug->openedBy])) $putInto[$bug->openedBy]['createdBug'] += 1; - if($bug->resolvedBy && isset($putInto[$bug->resolvedBy])) $putInto[$bug->resolvedBy]['resolvedBug'] += 1; - if($bug->assignedTo && $bug->status == 'active' && isset($putInto[$bug->assignedTo])) $putInto[$bug->assignedTo]['pendingBug'] += 1; + if($bug->openedBy && isset($invest[$bug->openedBy])) $invest[$bug->openedBy]['createdBug'] += 1; + if($bug->resolvedBy && isset($invest[$bug->resolvedBy])) $invest[$bug->resolvedBy]['resolvedBug'] += 1; + if($bug->assignedTo && $bug->status == 'active' && isset($invest[$bug->assignedTo])) $invest[$bug->assignedTo]['pendingBug'] += 1; } - return $putInto; + return $invest; } /** @@ -288,35 +288,35 @@ class personnelModel extends model ->fetchAll('id'); /* Initialize personnel related tasks. */ - $putInto = array(); + $invest = array(); foreach($accounts as $account => $project) { - $putInto[$account]['createdTask'] = 0; - $putInto[$account]['finishedTask'] = 0; - $putInto[$account]['pendingTask'] = 0; - $putInto[$account]['consumedTask'] = 0; - $putInto[$account]['leftTask'] = 0; + $invest[$account]['createdTask'] = 0; + $invest[$account]['finishedTask'] = 0; + $invest[$account]['pendingTask'] = 0; + $invest[$account]['consumedTask'] = 0; + $invest[$account]['leftTask'] = 0; } /* Number of tasks per person. */ $userTasks = array(); foreach($tasks as $task) { - if($task->openedBy && isset($putInto[$task->openedBy])) + if($task->openedBy && isset($invest[$task->openedBy])) { - $putInto[$task->openedBy]['createdTask'] += 1; + $invest[$task->openedBy]['createdTask'] += 1; $userTasks[$task->openedBy][$task->id] = $task->id; } - if($task->finishedBy && isset($putInto[$task->finishedBy])) + if($task->finishedBy && isset($invest[$task->finishedBy])) { - $putInto[$task->finishedBy]['finishedTask'] += 1; + $invest[$task->finishedBy]['finishedTask'] += 1; $userTasks[$task->finishedBy][$task->id] = $task->id; } - if($task->assignedTo && $task->status == 'wait' && isset($putInto[$task->assignedTo])) + if($task->assignedTo && $task->status == 'wait' && isset($invest[$task->assignedTo])) { - $putInto[$task->assignedTo]['pendingTask'] += 1; + $invest[$task->assignedTo]['pendingTask'] += 1; $userTasks[$task->assignedTo][$task->id] = $task->id; } } @@ -334,11 +334,11 @@ class personnelModel extends model foreach($userHours as $account => $hours) { - $putInto[$account]['leftTask'] = $hours->left; - $putInto[$account]['consumedTask'] = $hours->consumed; + $invest[$account]['leftTask'] = $hours->left; + $invest[$account]['consumedTask'] = $hours->consumed; } - return $putInto; + return $invest; } /** diff --git a/module/personnel/view/putinto.html.php b/module/personnel/view/putinto.html.php index 82e0f3152e..b4f0150103 100644 --- a/module/personnel/view/putinto.html.php +++ b/module/personnel/view/putinto.html.php @@ -1,6 +1,6 @@ - personnel->putInto;?> + personnel->invest;?> personnel->left;?> personnel->created;?> personnel->finished;?> diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php index 5680d77c7c..36ca0974ee 100644 --- a/module/personnel/view/whitelist.html.php +++ b/module/personnel/view/whitelist.html.php @@ -58,8 +58,8 @@ email;?> createLink($module, 'unbindWhielist', "id=$user->id&confirm=no"), '', 'hiddenwin', "title='{$lang->personnel->delete}' class='{$deleteClass}' $openApp"); + $deleteClass = common::hasPriv($module, 'unbindWhitelist') ? 'btn' : 'btn disabled'; + echo html::a($this->createLink($module, 'unbindWhitelist', "id=$user->id&confirm=no"), '', 'hiddenwin', "title='{$lang->personnel->delete}' class='{$deleteClass}' $openApp"); ?> diff --git a/module/product/control.php b/module/product/control.php index a7c0318fb4..53c247e325 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -1136,9 +1136,9 @@ class product extends control * @access public * @return void */ - public function unbindWhielist($id = 0, $confirm = 'no') + public function unbindWhitelist($id = 0, $confirm = 'no') { - echo $this->fetch('personnel', 'unbindWhielist', "id=$id&confirm=$confirm"); + echo $this->fetch('personnel', 'unbindWhitelist', "id=$id&confirm=$confirm"); } /** diff --git a/module/product/lang/de.php b/module/product/lang/de.php index dca39a99b2..e70e880ae3 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -92,7 +92,7 @@ $lang->product->RD = 'Release Manager'; $lang->product->acl = 'Zugriffskontrolle'; $lang->product->whitelist = 'Whitelist'; $lang->product->addWhitelist = 'Add Whitelist'; -$lang->product->unbindWhielist = 'Remove Whitelist'; +$lang->product->unbindWhitelist = 'Remove Whitelist'; $lang->product->branch = '%s'; $lang->product->qa = 'QA'; $lang->product->release = 'Release'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index a0606c730d..71f0c7f36b 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -92,7 +92,7 @@ $lang->product->RD = 'Release Manager'; $lang->product->acl = 'Access Control'; $lang->product->whitelist = 'Whitelist'; $lang->product->addWhitelist = 'Add Whitelist'; -$lang->product->unbindWhielist = 'Remove Whitelist'; +$lang->product->unbindWhitelist = 'Remove Whitelist'; $lang->product->branch = '%s'; $lang->product->qa = 'Test'; $lang->product->release = 'Release'; diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php index e8eadd80d6..ca43561fdc 100644 --- a/module/product/lang/fr.php +++ b/module/product/lang/fr.php @@ -92,7 +92,7 @@ $lang->product->RD = 'Release Manager'; $lang->product->acl = "Contrôle accès"; $lang->product->whitelist = 'Liste Blanche'; $lang->product->addWhitelist = 'Add Whitelist'; -$lang->product->unbindWhielist = 'Remove Whitelist'; +$lang->product->unbindWhitelist = 'Remove Whitelist'; $lang->product->branch = '%s'; $lang->product->qa = 'QA'; $lang->product->release = 'Release'; diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php index fb5686e99d..610d5de2c2 100644 --- a/module/product/lang/vi.php +++ b/module/product/lang/vi.php @@ -92,7 +92,7 @@ $lang->product->RD = 'Quản lý phát hành'; $lang->product->acl = 'Quyền truy cập'; $lang->product->whitelist = 'Danh sách trắng'; $lang->product->addWhitelist = 'Add Whitelist'; -$lang->product->unbindWhielist = 'Remove Whitelist'; +$lang->product->unbindWhitelist = 'Remove Whitelist'; $lang->product->branch = '%s'; $lang->product->qa = 'QA'; $lang->product->release = 'Phát hành'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index b23632362e..1fa12f928c 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -92,7 +92,7 @@ $lang->product->RD = '发布负责人'; $lang->product->acl = '访问控制'; $lang->product->whitelist = '白名单'; $lang->product->addWhitelist = '添加白名单'; -$lang->product->unbindWhielist = '删除白名单'; +$lang->product->unbindWhitelist = '删除白名单'; $lang->product->branch = '所属%s'; $lang->product->qa = '测试'; $lang->product->release = '发布'; diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index dd08ab4e79..883b58cbae 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -88,7 +88,7 @@ $lang->product->RD = '發佈負責人'; $lang->product->acl = '訪問控制'; $lang->product->whitelist = '白名單'; $lang->product->addWhitelist = '添加白名單'; -$lang->product->unbindWhielist = '刪除白名單'; +$lang->product->unbindWhitelist = '刪除白名單'; $lang->product->branch = '所屬%s'; $lang->product->qa = '測試'; $lang->product->release = '發佈'; diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php index f90f5f42d0..59bf585353 100644 --- a/module/program/lang/zh-tw.php +++ b/module/program/lang/zh-tw.php @@ -31,7 +31,7 @@ $lang->program->PRJUpdateOrder = '排序'; $lang->program->PRJSort = '項目排序'; $lang->program->PRJWhitelist = '項目白名單'; $lang->program->PRJAddWhitelist = '項目添加白名單'; -$lang->program->unbindWhielist = '項目刪除白名單'; +$lang->program->unbindWhitelist = '項目刪除白名單'; $lang->program->PRJManageProducts = '關聯產品'; $lang->program->view = '項目集詳情'; $lang->program->copyTitle = '請選擇要複製的項目'; diff --git a/module/project/control.php b/module/project/control.php index 7b464d8acf..19fbe7e744 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1189,9 +1189,9 @@ class project extends control * @access public * @return void */ - public function unbindWhielist($id = 0, $confirm = 'no') + public function unbindWhitelist($id = 0, $confirm = 'no') { - echo $this->fetch('personnel', 'unbindWhielist', "id=$id&confirm=$confirm"); + echo $this->fetch('personnel', 'unbindWhitelist', "id=$id&confirm=$confirm"); } /** diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 8c2a03b0f3..439ff81b84 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -32,7 +32,7 @@ $lang->project->updateOrder = 'Order'; $lang->project->sort = 'Order'; $lang->project->whitelist = 'Project Whitelist'; $lang->project->addWhitelist = 'Project Add Whitelist'; -$lang->project->unbindWhielist = 'Project Remove Whitelist'; +$lang->project->unbindWhitelist = 'Project Remove Whitelist'; $lang->project->manageProducts = 'Manage Products'; $lang->project->copyTitle = 'Please select an project to copy'; $lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index bbb20ab9db..f75c4ca9ee 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -32,7 +32,7 @@ $lang->project->updateOrder = 'Order'; $lang->project->sort = 'Order'; $lang->project->whitelist = 'Project Whitelist'; $lang->project->addWhitelist = 'Project Add Whitelist'; -$lang->project->unbindWhielist = 'Project Remove Whitelist'; +$lang->project->unbindWhitelist = 'Project Remove Whitelist'; $lang->project->manageProducts = 'Manage Products'; $lang->project->copyTitle = 'Please select an project to copy'; $lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index cec11e6bf4..62b00a54fa 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -32,7 +32,7 @@ $lang->project->updateOrder = 'Order'; $lang->project->sort = 'Order'; $lang->project->whitelist = 'Project Whitelist'; $lang->project->addWhitelist = 'Project Add Whitelist'; -$lang->project->unbindWhielist = 'Project Remove Whitelist'; +$lang->project->unbindWhitelist = 'Project Remove Whitelist'; $lang->project->manageProducts = 'Manage Products'; $lang->project->copyTitle = 'Please select an project to copy'; $lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php index a4358e87e6..ced76f81f8 100644 --- a/module/project/lang/vi.php +++ b/module/project/lang/vi.php @@ -32,7 +32,7 @@ $lang->project->updateOrder = 'Order'; $lang->project->sort = 'Order'; $lang->project->whitelist = 'Project Whitelist'; $lang->project->addWhitelist = 'Project Add Whitelist'; -$lang->project->unbindWhielist = 'Project Remove Whitelist'; +$lang->project->unbindWhitelist = 'Project Remove Whitelist'; $lang->project->manageProducts = 'Manage Products'; $lang->project->copyTitle = 'Please select an project to copy'; $lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 745340a379..8b4377dfee 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -33,7 +33,7 @@ $lang->project->updateOrder = '排序'; $lang->project->sort = '项目排序'; $lang->project->whitelist = '项目白名单'; $lang->project->addWhitelist = '项目添加白名单'; -$lang->project->unbindWhielist = '项目删除白名单'; +$lang->project->unbindWhitelist = '项目删除白名单'; $lang->project->manageProducts = '关联产品'; $lang->project->copyTitle = '请选择要复制的项目'; $lang->project->errorSameProducts = '项目不能关联多个相同的产品。'; diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index 36b135ab1d..d989579b09 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -31,7 +31,7 @@ $lang->project->PRJUpdateOrder = '排序'; $lang->project->PRJSort = '項目排序'; $lang->project->PRJWhitelist = '項目白名單'; $lang->project->PRJAddWhitelist = '項目添加白名單'; -$lang->project->unbindWhielist = '項目刪除白名單'; +$lang->project->unbindWhitelist = '項目刪除白名單'; $lang->project->PRJManageProducts = '關聯產品'; $lang->project->view = '項目集詳情'; $lang->project->copyTitle = '請選擇要複製的項目';