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

chg: [inbox] Usage of virtual field `local_tool_name`

pull/59/head
mokaddem 2021-06-12 13:32:25 +02:00
parent 4966e6252e
commit 21bc99e504
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/default/RequestProcessors/LocalToolRequestProcessor.php
View File

@ -84,7 +84,7 @@ class IncomingConnectionRequestProcessor extends LocalToolRequestProcessor imple
public function create($requestData) {
$this->validateToolName($requestData);
$this->validateRequestData($requestData);
$requestData['title'] = __('Request for {0} Inter-connection', $requestData['data']['toolName']);
$requestData['title'] = __('Request for {0} Inter-connection', $requestData['local_tool_name']);
return parent::create($requestData);
}
@ -107,7 +107,7 @@ class IncomingConnectionRequestProcessor extends LocalToolRequestProcessor imple
return $this->genActionResult(
$interConnectionResult,
$connectionSuccessfull,
$connectionSuccessfull ? __('Interconnection for `{0}`\'s {1} created',$requestData['origin'], '[toolname]') : __('Could not inter-connect `{0}`\'s {1}', $requestData['origin'], '[toolname]'),
$connectionSuccessfull ? __('Interconnection for `{0}`\'s {1} created',$requestData['origin'], $requestData['local_tool_name']) : __('Could not inter-connect `{0}`\'s {1}', $requestData['origin'], $requestData['local_tool_name']),
[]
);
}
@ -137,7 +137,7 @@ class AcceptedRequestProcessor extends LocalToolRequestProcessor implements Gene
public function create($requestData) {
$this->validateToolName($requestData);
$this->validateRequestData($requestData);
$requestData['title'] = __('Inter-connection for {0} has been accepted', $requestData['data']['toolName']);
$requestData['title'] = __('Inter-connection for {0} has been accepted', $requestData['local_tool_name']);
return parent::create($requestData);
}
@ -160,7 +160,7 @@ class AcceptedRequestProcessor extends LocalToolRequestProcessor implements Gene
return $this->genActionResult(
$interConnectionResult,
$connectionSuccessfull,
$connectionSuccessfull ? __('Interconnection for `{0}`\'s {1} finalized', $requestData['origin'], '[toolname]') : __('Could not inter-connect `{0}`\'s {1}', $requestData['origin'], '[toolname]'),
$connectionSuccessfull ? __('Interconnection for `{0}`\'s {1} finalized', $requestData['origin'], $requestData['local_tool_name']) : __('Could not inter-connect `{0}`\'s {1}', $requestData['origin'], $requestData['local_tool_name']),
[]
);
}
@ -188,7 +188,7 @@ class DeclinedRequestProcessor extends LocalToolRequestProcessor implements Gene
public function create($requestData) {
$this->validateToolName($requestData);
$this->validateRequestData($requestData);
$requestData['title'] = __('Declined inter-connection for {0}', $requestData['data']['toolName']);
$requestData['title'] = __('Declined inter-connection for {0}', $requestData['local_tool_name']);
return parent::create($requestData);
}
@ -216,7 +216,7 @@ class DeclinedRequestProcessor extends LocalToolRequestProcessor implements Gene
return $this->genActionResult(
$interConnectionResult,
$connectionSuccessfull,
$connectionSuccessfull ? __('Interconnection for `{0}`\'s {1} finalized', $requestData['origin'], '[toolname]') : __('Could not inter-connect `{0}`\'s {1}', $requestData['origin'], '[toolname]'),
$connectionSuccessfull ? __('Interconnection for `{0}`\'s {1} finalized', $requestData['origin'], $requestData['local_tool_name']) : __('Could not inter-connect `{0}`\'s {1}', $requestData['origin'], $requestData['local_tool_name']),
[]
);
}

2
src/Controller/InboxController.php
View File

@ -82,7 +82,7 @@ class InboxController extends AppController
$action = $request->action;
$this->requestProcessor = TableRegistry::getTableLocator()->get('RequestProcessor');
if ($scope == 'LocalTool') {
$processor = $this->requestProcessor->getLocalToolProcessor($action, $request->data['toolName']);
$processor = $this->requestProcessor->getLocalToolProcessor($action, $request->local_tool_name);
} else {
$processor = $this->requestProcessor->getProcessor($scope, $action);
}

9
src/Model/Entity/Inbox.php
View File

@ -7,5 +7,14 @@ use Cake\ORM\Entity;
class Inbox extends AppModel
{
protected $_virtual = ['local_tool_name'];
protected function _getLocalToolName()
{
$localToolName = null;
if (!empty($this->data) && !empty($this->data['toolName'])) {
$localToolName = $this->data['toolName'];
}
return $localToolName;
}
}