From 2107e14e101c63ecf1efd456662b2e3ca8ee85fc Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 21 Dec 2023 08:57:14 +0800 Subject: [PATCH] * Refactor stakeholder::delete method. --- module/stakeholder/config/action.php | 2 +- module/stakeholder/control.php | 31 +++++++++++----------------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/module/stakeholder/config/action.php b/module/stakeholder/config/action.php index 3cf2bc28f5..c17b0b7887 100644 --- a/module/stakeholder/config/action.php +++ b/module/stakeholder/config/action.php @@ -25,7 +25,7 @@ $config->stakeholder->actionList['edit']['url'] = helper::createLink('stakehold $config->stakeholder->actionList['delete']['icon'] = 'trash'; $config->stakeholder->actionList['delete']['text'] = $lang->delete; $config->stakeholder->actionList['delete']['hint'] = $lang->delete; -$config->stakeholder->actionList['delete']['url'] = helper::createLink('stakeholder', 'delete', 'id={id}&confirm=yes'); +$config->stakeholder->actionList['delete']['url'] = helper::createLink('stakeholder', 'delete', 'id={id}'); $config->stakeholder->actionList['delete']['className'] = 'ajax-submit'; $config->stakeholder->actionList['delete']['data-confirm'] = $lang->stakeholder->confirmDelete; diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php index 53b60e94d3..20462b32e9 100644 --- a/module/stakeholder/control.php +++ b/module/stakeholder/control.php @@ -274,33 +274,26 @@ class stakeholder extends control } /** + * 删除一个干系人。 * Deleted user. * * @access public - * @param int $userID - * @param string $confirm yes|no + * @param int $userID * @return void */ - public function delete($userID, $confirm = 'no') + public function delete(int $userID) { - if($confirm == 'no') - { - $confirmURL = inLink('delete', "userID=$userID&confirm=yes"); - return $this->send(array('result' => 'fail', 'callback' => "zui.Modal.confirm('{$this->lang->stakeholder->confirmDelete}').then((res) => {if(res) $.ajaxSubmit({url: '$confirmURL'});});")); - } - else - { - $stakeholder = $this->stakeholder->getByID($userID); - $this->stakeholder->delete(TABLE_STAKEHOLDER, $userID); - $this->loadModel('user')->updateUserView($this->session->project, 'project'); + $stakeholder = $this->stakeholder->getByID($userID); + $this->stakeholder->delete(TABLE_STAKEHOLDER, $userID); + $this->loadModel('user')->updateUserView($this->session->project, 'project'); - /* Update linked products view. */ - if($stakeholder->objectType == 'project' and $stakeholder->objectID) - { - $this->loadModel('project')->updateInvolvedUserView($stakeholder->objectID, array($stakeholder->user)); - } - return $this->send(array('result' => 'success', 'load' => true)); + /* Update linked products view. */ + if($stakeholder->objectType == 'project' && $stakeholder->objectID) + { + $this->loadModel('project')->updateInvolvedUserView($stakeholder->objectID, array($stakeholder->user)); } + + return $this->send(array('result' => 'success', 'load' => true)); } /**