From 35699d9779e80a7b3de29350e295b659670291da Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 13 Oct 2020 09:11:03 +0800 Subject: [PATCH] * Finish task #8123. --- module/program/control.php | 17 +++++++++-------- module/program/lang/zh-cn.php | 1 + module/program/view/createstakeholder.html.php | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/module/program/control.php b/module/program/control.php index 0c514551c0..59454e8af1 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -457,7 +457,7 @@ class program extends control * @access public * @return void */ - public function createStakeholder($programID = 0, $dept = '') + public function createStakeholder($programID = 0, $dept = '', $parentID = 0) { if($_POST) { @@ -476,13 +476,14 @@ class program extends control $this->view->title = $this->lang->program->createStakeholder; $this->view->position[] = $this->lang->program->createStakeholder; - $this->view->programID = $programID; - $this->view->program = $this->program->getPRJByID($programID); - $this->view->users = $this->loadModel('user')->getPairs('nodeleted'); - $this->view->deptUsers = $deptUsers; - $this->view->dept = $dept; - $this->view->depts = array('' => '') + $this->dept->getOptionMenu(); - $this->view->stakeholders = $this->program->getStakeholders($programID, 't1.id_desc'); + $this->view->programID = $programID; + $this->view->program = $this->program->getPGMByID($programID); + $this->view->users = $this->loadModel('user')->getPairs('nodeleted'); + $this->view->deptUsers = $deptUsers; + $this->view->dept = $dept; + $this->view->depts = array('' => '') + $this->dept->getOptionMenu(); + $this->view->stakeholders = $this->program->getStakeholders($programID, 't1.id_desc'); + $this->view->parentStakeholders = $this->program->getStakeholders($parentID, 't1.id_desc'); $this->display(); } diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index f703ac3321..b6a24c8387 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -183,6 +183,7 @@ $lang->program->PGMExport = '导出'; $lang->program->PGMManageGroupMember = '维护分组用户'; $lang->program->PGMStakeholder = '干系人列表'; $lang->program->createStakeholder = '添加干系人'; +$lang->program->importStakeholder = '从父项目导入'; /* Fields. */ $lang->program->PGMName = '项目集名称'; diff --git a/module/program/view/createstakeholder.html.php b/module/program/view/createstakeholder.html.php index 569206073d..f0985ffa5e 100644 --- a/module/program/view/createstakeholder.html.php +++ b/module/program/view/createstakeholder.html.php @@ -21,6 +21,9 @@ project->selectDept?> project->selectDeptTitle}'");?> + parent):?> + createLink('program', 'createStakeholder', "programID=$programID&dept=&parent=$program->parent"), $lang->program->importStakeholder, '', 'class="btn btn-primary"');?> +