cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

chg: [requestProcessor] Moved setViewVariables

pull/41/head
mokaddem 2021-03-19 11:15:43 +01:00
parent a5e1e39671
commit bc1feaa9e6
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Controller/BroodsController.php
View File

@ -163,6 +163,7 @@ class BroodsController extends AppController
$data = [ $data = [
'origin' => '127.0.0.1', 'origin' => '127.0.0.1',
'comment' => 'Test comment', 'comment' => 'Test comment',
'user_id' => $this->ACL->getUser()->id,
'data' => [ 'data' => [
'foo' => 'foo', 'foo' => 'foo',
'bar' => 'bar', 'bar' => 'bar',

3
src/Controller/Component/RestResponseComponent.php
View File

@ -439,11 +439,12 @@ class RestResponseComponent extends Component
public function ajaxFailResponse($ObjectAlias, $action, $entity, $message, $errors = []) public function ajaxFailResponse($ObjectAlias, $action, $entity, $message, $errors = [])
{ {
$action = $this->__dissectAdminRouting($action); $action = $this->__dissectAdminRouting($action);
$entity = is_array($entity) ? $entity : $entity->toArray();
$response = [ $response = [
'success' => false, 'success' => false,
'message' => $message, 'message' => $message,
'errors' => $errors, 'errors' => $errors,
'url' => $this->__generateURL($action, $ObjectAlias, $entity->id) 'url' => !empty($entity['id']) ? $this->__generateURL($action, $ObjectAlias, $entity['id']) : ''
]; ];
return $this->viewData($response); return $this->viewData($response);
} }

2
src/Model/Table/RequestProcessorTable.php
View File

@ -47,10 +47,10 @@ class RequestProcessorTable extends AppTable
public function render($controller, $processor, $request=[]) public function render($controller, $processor, $request=[])
{ {
$processor->setViewVariables($controller, $request);
$controller->set('request', $request); $controller->set('request', $request);
$controller->viewBuilder()->setLayout('ajax'); $controller->viewBuilder()->setLayout('ajax');
$processingTemplate = $processor->getProcessingTemplate(); $processingTemplate = $processor->getProcessingTemplate();
$processor->setViewVariables($controller, $request);
$controller->render($processingTemplate); $controller->render($processingTemplate);
} }