From ea67994c31a7feab5d82be751acca68d24be0918 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 12 Apr 2021 09:48:57 +0800 Subject: [PATCH 1/2] * Fix bug #11979. --- module/stakeholder/view/batchcreate.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/stakeholder/view/batchcreate.html.php b/module/stakeholder/view/batchcreate.html.php index 03d36c44a0..26b04d6cb6 100644 --- a/module/stakeholder/view/batchcreate.html.php +++ b/module/stakeholder/view/batchcreate.html.php @@ -22,7 +22,7 @@ execution->selectDeptTitle}'");?> parent and $config->systemMode == 'new'):?> - createLink('stakeholder', 'batchcreate', "dept=&parent=$project->parent"), $lang->program->importStakeholder, '', 'class="btn btn-primary"');?> + createLink('stakeholder', 'batchcreate', "projectID={$projectID}&dept=&parent=$project->parent"), $lang->program->importStakeholder, '', 'class="btn btn-primary"');?> From 1f29a2c621f073185b32ddf1c81a905074dc70f8 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 12 Apr 2021 09:53:40 +0800 Subject: [PATCH 2/2] * Fix bug #11979. --- module/stakeholder/control.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php index 1c7fde7b9e..5be9e47de7 100644 --- a/module/stakeholder/control.php +++ b/module/stakeholder/control.php @@ -145,6 +145,8 @@ class stakeholder extends control public function edit($stakeholderID = 0) { $stakeholder = $this->stakeholder->getByID($stakeholderID); + $this->loadModel('project')->setMenu($stakeholder->objectID); + if($_POST) { $changes = $this->stakeholder->edit($stakeholderID); @@ -318,11 +320,14 @@ class stakeholder extends control */ public function view($userID = 0) { + $user = $this->stakeholder->getByID($userID); + $this->loadModel('project')->setMenu($user->objectID); $this->commonAction($userID, 'stakeholder'); + $this->view->title = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->view; $this->view->position[] = $this->lang->stakeholder->view; - $this->view->user = $this->stakeholder->getByID($userID); + $this->view->user = $user; $this->view->users = $this->loadModel('execution')->getTeamMemberPairs($this->session->project,'nodeleted'); $this->view->expects = $this->stakeholder->getExpectByUser($userID);