From 5b73ba5f3674fba4282f68c062d4e6a94657b0bc Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Fri, 22 Jul 2022 09:20:02 +0800 Subject: [PATCH] * Fix bug #25581. --- module/mr/control.php | 2 +- module/mr/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/mr/control.php b/module/mr/control.php index 8be2015221..d449427c93 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -473,7 +473,7 @@ class mr extends control $this->view->MR = $MR; $this->view->action = $action; - $this->view->actions = $this->loadModel('action')->getList('mrapproval', $MRID); + $this->view->actions = $this->loadModel('action')->getList('mr', $MRID); $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); $this->display(); } diff --git a/module/mr/model.php b/module/mr/model.php index a85568faaa..c45a6cb148 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -1213,7 +1213,7 @@ class mrModel extends model public function approve($MR, $action = 'approve', $comment = '') { $this->loadModel('action'); - $actionID = $this->action->create('mrapproval', $MR->id, $action); + $actionID = $this->action->create('mr', $MR->id, $action); $oldMR = $MR; if(isset($MR->status) and $MR->status == 'opened')