diff --git a/libraries/RequestProcessors/GenericRequestProcessor.php b/libraries/RequestProcessors/GenericRequestProcessor.php index 8a5d0f7..cc1b4aa 100644 --- a/libraries/RequestProcessors/GenericRequestProcessor.php +++ b/libraries/RequestProcessors/GenericRequestProcessor.php @@ -120,15 +120,10 @@ class GenericRequestProcessor ]; } - public function genHTTPReply($controller, $processResult, $request, $redirect=null) + public function genHTTPReply($controller, $processResult, $redirect=null) { - if (is_array($request)) { - $scope = $request['scope']; - $action = $request['action']; - } else { - $scope = $request->scope; - $action = $request->action; - } + $scope = $this->scope; + $action = $this->action; if ($processResult['success']) { $message = !empty($processResult['message']) ? $processResult['message'] : __('Request {0} successfully processed.', $id); if ($controller->ParamHandler->isRest()) { diff --git a/src/Controller/BroodsController.php b/src/Controller/BroodsController.php index 6e59a9c..d954f77 100644 --- a/src/Controller/BroodsController.php +++ b/src/Controller/BroodsController.php @@ -171,6 +171,6 @@ class BroodsController extends AppController ], ]; $processorResult = $processor->create($data); - return $processor->genHTTPReply($this, $processorResult, ['scope' => 'Brood', 'action' => 'ToolInterconnection'], ['controller' => 'Broods', 'action' => 'index']); + return $processor->genHTTPReply($this, $processorResult, ['controller' => 'Broods', 'action' => 'index']); } } diff --git a/src/Controller/InboxController.php b/src/Controller/InboxController.php index 225c31d..9661e83 100644 --- a/src/Controller/InboxController.php +++ b/src/Controller/InboxController.php @@ -64,7 +64,7 @@ class InboxController extends AppController $this->requestProcessor = TableRegistry::getTableLocator()->get('RequestProcessor'); $processor = $this->requestProcessor->getProcessor($request->scope, $request->action); $discardResult = $processor->discard($id, $request); - return $processor->genHTTPReply($this, $discardResult, $request); + return $processor->genHTTPReply($this, $discardResult); } $this->set('deletionTitle', __('Discard request')); $this->set('deletionText', __('Are you sure you want to discard request #{0}?', $id)); @@ -85,7 +85,7 @@ class InboxController extends AppController $processor = $this->requestProcessor->getProcessor($request->scope, $request->action); if ($this->request->is('post')) { $processResult = $processor->process($id, $this->request->getData()); - return $processor->genHTTPReply($this, $processResult, $request); + return $processor->genHTTPReply($this, $processResult); } else { $this->requestProcessor->render($this, $processor, $request); } diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php index a8f6c01..03ed6ad 100644 --- a/src/Controller/UsersController.php +++ b/src/Controller/UsersController.php @@ -151,6 +151,6 @@ class UsersController extends AppController ], ]; $processorResult = $processor->create($data); - return $processor->genHTTPReply($this, $processorResult, ['scope' => 'User', 'action' => 'Registration'], ['controller' => 'Inbox', 'action' => 'index']); + return $processor->genHTTPReply($this, $processorResult, ['controller' => 'Inbox', 'action' => 'index']); } }